Refactor Autofill for out of process iframes (OOPIF).

components/password_manager/core/browser/password_form_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/password_manager/core/browser/password_form_manager.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/metrics/histogram.h"
@@ skipping 337 matching lines @@
       !has_generated_password_) {
     LogPasswordGenerationSubmissionEvent(PASSWORD_OVERRIDDEN);
   }
 
   if (has_generated_password_)
     pending_credentials_.type = PasswordForm::TYPE_GENERATED;
 }
 
 void PasswordFormManager::Save() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
-  DCHECK(!driver_->IsOffTheRecord());
+  DCHECK(!client_->IsOffTheRecord());
 
   if (IsNewLogin())
     SaveAsNewLogin(true);
   else
     UpdateLogin();
 }
 
 void PasswordFormManager::FetchMatchingLoginsFromPasswordStore(
     PasswordStore::AuthorizationPromptPolicy prompt_policy) {
   DCHECK_EQ(state_, PRE_MATCHING_PHASE);
@@ skipping 140 matching lines @@
   }
 
   // If not blacklisted, inform the driver that password generation is allowed
   // for |observed_form_|.
   driver_->AllowPasswordGenerationForForm(observed_form_);
 
   // Proceed to autofill.
   // Note that we provide the choices but don't actually prefill a value if:
   // (1) we are in Incognito mode, (2) the ACTION paths don't match,
   // or (3) if it matched using public suffix domain matching.
-  bool wait_for_username =
-      driver_->IsOffTheRecord() ||
-      observed_form_.action.GetWithEmptyPath() !=
-          preferred_match_->action.GetWithEmptyPath() ||
-          preferred_match_->IsPublicSuffixMatch();
+  bool wait_for_username = client_->IsOffTheRecord() ||
+                           observed_form_.action.GetWithEmptyPath() !=
+                               preferred_match_->action.GetWithEmptyPath() ||
+                           preferred_match_->IsPublicSuffixMatch();
   if (wait_for_username)
     manager_action_ = kManagerActionNone;
   else
     manager_action_ = kManagerActionAutofilled;
-  password_manager_->Autofill(observed_form_, best_matches_,
+  password_manager_->Autofill(driver_, observed_form_, best_matches_,
                               *preferred_match_, wait_for_username);
 }
 
 void PasswordFormManager::OnGetPasswordStoreResults(
       const std::vector<autofill::PasswordForm*>& results) {
   DCHECK_EQ(state_, MATCHING_PHASE);
 
   scoped_ptr<BrowserSavePasswordProgressLogger> logger;
   if (client_->IsLoggingActive()) {
     logger.reset(new BrowserSavePasswordProgressLogger(client_));
@@ skipping 28 matching lines @@
 }
 
 void PasswordFormManager::SaveAsNewLogin(bool reset_preferred_login) {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(IsNewLogin());
   // The new_form is being used to sign in, so it is preferred.
   DCHECK(pending_credentials_.preferred);
   // new_form contains the same basic data as observed_form_ (because its the
   // same form), but with the newly added credentials.
 
-  DCHECK(!driver_->IsOffTheRecord());
+  DCHECK(!client_->IsOffTheRecord());
 
   PasswordStore* password_store = client_->GetPasswordStore();
   if (!password_store) {
     NOTREACHED();
     return;
   }
 
   // Upload credentials the first time they are saved. This data is used
   // by password generation to help determine account creation sites.
   // Blacklisted credentials will never be used, so don't upload a vote for
@@ skipping 53 matching lines @@
 }
 
 void PasswordFormManager::UpdateLogin() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   DCHECK(preferred_match_);
   // If we're doing an Update, we either autofilled correctly and need to
   // update the stats, or the user typed in a new password for autofilled
   // username, or the user selected one of the non-preferred matches,
   // thus requiring a swap of preferred bits.
   DCHECK(!IsNewLogin() && pending_credentials_.preferred);
-  DCHECK(!driver_->IsOffTheRecord());
+  DCHECK(!client_->IsOffTheRecord());
 
   PasswordStore* password_store = client_->GetPasswordStore();
   if (!password_store) {
     NOTREACHED();
     return;
   }
 
   UpdateMetadataForUsage(pending_credentials_);
 
   if (client_->IsSyncAccountCredential(
@@ skipping 190 matching lines @@
     LogPasswordGenerationSubmissionEvent(PASSWORD_SUBMITTED);
 }
 
 void PasswordFormManager::SubmitFailed() {
   submit_result_ = kSubmitResultFailed;
   if (has_generated_password_)
     LogPasswordGenerationSubmissionEvent(PASSWORD_SUBMISSION_FAILED);
 }
 
 }  // namespace password_manager