[Password Manager] Fix saving for accounts.google.com.

components/password_manager/core/browser/password_form_manager.h

Index: components/password_manager/core/browser/password_form_manager.h
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index d8e5e296ee5dc79d0123979d894b4da619b86585..fa0257629d4a0411791a19be3a2de1b3d4f7bb70 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -69,9 +69,9 @@ class PasswordFormManager : public FormFetcher::Consumer {
     RESULT_NO_MATCH = 0,
     RESULT_ACTION_MATCH = 1 << 0,
     RESULT_HTML_ATTRIBUTES_MATCH = 1 << 1,
-    RESULT_ORIGINS_MATCH = 1 << 2,
+    RESULT_ORIGINS_OR_FRAMES_MATCH = 1 << 2,
     RESULT_COMPLETE_MATCH = RESULT_ACTION_MATCH | RESULT_HTML_ATTRIBUTES_MATCH |
-                            RESULT_ORIGINS_MATCH
+                            RESULT_ORIGINS_OR_FRAMES_MATCH
   };
   // Use MatchResultMask to contain combinations of MatchResultFlags values.
   // It's a signed int rather than unsigned to avoid signed/unsigned mismatch
@@ -89,7 +89,11 @@ class PasswordFormManager : public FormFetcher::Consumer {
 
   // Compares basic data of |observed_form_| with |form| and returns how much
   // they match. The return value is a MatchResultMask bitmask.
-  MatchResultMask DoesManage(const autofill::PasswordForm& form) const;
+  // |driver| is optional and if it's given it should be a driver that
+  // corresponds to a frame from which |form| comes from.
+  MatchResultMask DoesManage(
+      const autofill::PasswordForm& form,
+      const password_manager::PasswordManagerDriver* driver) const;
 
   // Update |this| with the |form| that was actually submitted. Used to
   // determine what type the submitted form is for