BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

8 files changed, 23 insertions, 25 deletions

diff --git a/chromium/components/password_manager/content/browser/bad_message.cc b/chromium/components/password_manager/content/browser/bad_message.cc
index 764e9333468..73b6e360b4c 100644
--- a/chromium/components/password_manager/content/browser/bad_message.cc
+++ b/chromium/components/password_manager/content/browser/bad_message.cc
@@ -59,7 +59,7 @@ bool CheckChildProcessSecurityPolicy(
     content::RenderFrameHost* frame,
     const autofill::PasswordForm& password_form,
     BadMessageReason reason) {
-  return CheckChildProcessSecurityPolicyForURL(frame, password_form.origin,
+  return CheckChildProcessSecurityPolicyForURL(frame, password_form.url,
                                                reason) &&
          CheckChildProcessSecurityPolicyForURL(
              frame, GURL(password_form.signon_realm), reason) &&
diff --git a/chromium/components/password_manager/content/browser/content_credential_manager.cc b/chromium/components/password_manager/content/browser/content_credential_manager.cc
index d857c92b044..67e3569a931 100644
--- a/chromium/components/password_manager/content/browser/content_credential_manager.cc
+++ b/chromium/components/password_manager/content/browser/content_credential_manager.cc
@@ -16,7 +16,7 @@ ContentCredentialManager::ContentCredentialManager(
     PasswordManagerClient* client)
     : impl_(client) {}
 
-ContentCredentialManager::~ContentCredentialManager() {}
+ContentCredentialManager::~ContentCredentialManager() = default;
 
 void ContentCredentialManager::BindRequest(
     mojo::PendingReceiver<blink::mojom::CredentialManager> receiver) {
diff --git a/chromium/components/password_manager/content/browser/content_password_manager_driver.cc b/chromium/components/password_manager/content/browser/content_password_manager_driver.cc
index 108a095999e..cfda4606ff5 100644
--- a/chromium/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/chromium/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -111,9 +111,11 @@ void ContentPasswordManagerDriver::FillPasswordForm(
       autofill::MaybeClearPasswordValues(form_data));
 }
 
-void ContentPasswordManagerDriver::InformNoSavedCredentials() {
+void ContentPasswordManagerDriver::InformNoSavedCredentials(
+    bool should_show_popup_without_passwords) {
   GetPasswordAutofillManager()->OnNoCredentialsFound();
-  GetPasswordAutofillAgent()->InformNoSavedCredentials();
+  GetPasswordAutofillAgent()->InformNoSavedCredentials(
+      should_show_popup_without_passwords);
 }
 
 void ContentPasswordManagerDriver::FormEligibleForGenerationFound(
@@ -256,10 +258,11 @@ void ContentPasswordManagerDriver::ShowManualFallbackForSaving(
   GetPasswordManager()->ShowManualFallbackForSaving(this, form_data);
 
   if (client_->IsIsolationForPasswordSitesEnabled()) {
-    // This function signals that the user is typing a password into
-    // password form.  Use this as a heuristic to start site-isolating the
-    // form's site.  This is intended to be used primarily when full site
-    // isolation is not used, such as on Android.
+    // This function signals that a password field has been filled (whether by
+    // the user, JS, autofill, or some other means) or a password form has been
+    // submitted. Use this as a heuristic to start site-isolating the form's
+    // site. This is intended to be used primarily when full site isolation is
+    // not used, such as on Android.
     content::SiteInstance::StartIsolatingSite(
         render_frame_host_->GetSiteInstance()->GetBrowserContext(),
         form_data.url);
diff --git a/chromium/components/password_manager/content/browser/content_password_manager_driver.h b/chromium/components/password_manager/content/browser/content_password_manager_driver.h
index de351accb5e..5aa51d0f3a7 100644
--- a/chromium/components/password_manager/content/browser/content_password_manager_driver.h
+++ b/chromium/components/password_manager/content/browser/content_password_manager_driver.h
@@ -53,7 +53,8 @@ class ContentPasswordManagerDriver
   int GetId() const override;
   void FillPasswordForm(
       const autofill::PasswordFormFillData& form_data) override;
-  void InformNoSavedCredentials() override;
+  void InformNoSavedCredentials(
+      bool should_show_popup_without_passwords) override;
   void FormEligibleForGenerationFound(
       const autofill::PasswordFormGenerationData& form) override;
   void GeneratedPasswordAccepted(const base::string16& password) override;
diff --git a/chromium/components/password_manager/content/browser/content_password_manager_driver_factory.cc b/chromium/components/password_manager/content/browser/content_password_manager_driver_factory.cc
index 1a595a784c6..1d309b25f3a 100644
--- a/chromium/components/password_manager/content/browser/content_password_manager_driver_factory.cc
+++ b/chromium/components/password_manager/content/browser/content_password_manager_driver_factory.cc
@@ -56,7 +56,8 @@ ContentPasswordManagerDriverFactory::ContentPasswordManagerDriverFactory(
       password_client_(password_client),
       autofill_client_(autofill_client) {}
 
-ContentPasswordManagerDriverFactory::~ContentPasswordManagerDriverFactory() {}
+ContentPasswordManagerDriverFactory::~ContentPasswordManagerDriverFactory() =
+    default;
 
 // static
 ContentPasswordManagerDriverFactory*
diff --git a/chromium/components/password_manager/content/browser/content_password_manager_driver_unittest.cc b/chromium/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
index d89a7483d02..66ca88b17ce 100644
--- a/chromium/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
+++ b/chromium/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
@@ -61,13 +61,6 @@ class MockPasswordManagerClient : public StubPasswordManagerClient {
 class FakePasswordAutofillAgent
     : public autofill::mojom::PasswordAutofillAgent {
  public:
-  FakePasswordAutofillAgent()
-      : called_set_logging_state_(false),
-        logging_state_active_(false),
-        receiver_(this) {}
-
-  ~FakePasswordAutofillAgent() override {}
-
   void BindPendingReceiver(mojo::ScopedInterfaceEndpointHandle handle) {
     receiver_.Bind(
         mojo::PendingAssociatedReceiver<autofill::mojom::PasswordAutofillAgent>(
@@ -85,7 +78,7 @@ class FakePasswordAutofillAgent
 
   // autofill::mojom::PasswordAutofillAgent:
   MOCK_METHOD1(FillPasswordForm, void(const PasswordFormFillData&));
-  MOCK_METHOD0(InformNoSavedCredentials, void());
+  MOCK_METHOD1(InformNoSavedCredentials, void(bool));
   MOCK_METHOD2(FillIntoFocusedField, void(bool, const base::string16&));
   MOCK_METHOD1(TouchToFillClosed, void(bool));
   MOCK_METHOD1(AnnotateFieldsWithParsingResult, void(const ParsingResult&));
@@ -99,17 +92,18 @@ class FakePasswordAutofillAgent
   }
 
   // Records whether SetLoggingState() gets called.
-  bool called_set_logging_state_;
+  bool called_set_logging_state_ = false;
   // Records data received via SetLoggingState() call.
-  bool logging_state_active_;
+  bool logging_state_active_ = false;
 
-  mojo::AssociatedReceiver<autofill::mojom::PasswordAutofillAgent> receiver_;
+  mojo::AssociatedReceiver<autofill::mojom::PasswordAutofillAgent> receiver_{
+      this};
 };
 
 PasswordFormFillData GetTestPasswordFormFillData() {
   // Create the current form on the page.
   PasswordForm form_on_page;
-  form_on_page.origin = GURL("https://foo.com/");
+  form_on_page.url = GURL("https://foo.com/");
   form_on_page.action = GURL("https://foo.com/login");
   form_on_page.signon_realm = "https://foo.com/";
   form_on_page.scheme = PasswordForm::Scheme::kHtml;
diff --git a/chromium/components/password_manager/content/browser/password_manager_log_router_factory_unittest.cc b/chromium/components/password_manager/content/browser/password_manager_log_router_factory_unittest.cc
index eae9faafab7..9e407ecc252 100644
--- a/chromium/components/password_manager/content/browser/password_manager_log_router_factory_unittest.cc
+++ b/chromium/components/password_manager/content/browser/password_manager_log_router_factory_unittest.cc
@@ -21,8 +21,6 @@ const char kTestText[] = "abcd1234";
 
 class MockLogReceiver : public autofill::LogReceiver {
  public:
-  MockLogReceiver() {}
-
   MOCK_METHOD1(LogEntry, void(const base::Value&));
 };
 
diff --git a/chromium/components/password_manager/content/browser/password_requirements_service_factory.cc b/chromium/components/password_manager/content/browser/password_requirements_service_factory.cc
index 07f4b0665a7..72f194508e0 100644
--- a/chromium/components/password_manager/content/browser/password_requirements_service_factory.cc
+++ b/chromium/components/password_manager/content/browser/password_requirements_service_factory.cc
@@ -36,7 +36,8 @@ PasswordRequirementsServiceFactory::PasswordRequirementsServiceFactory()
           "PasswordRequirementsServiceFactory",
           BrowserContextDependencyManager::GetInstance()) {}
 
-PasswordRequirementsServiceFactory::~PasswordRequirementsServiceFactory() {}
+PasswordRequirementsServiceFactory::~PasswordRequirementsServiceFactory() =
+    default;
 
 KeyedService* PasswordRequirementsServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {