Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/password_generation_manager_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_generation_manager.h"
 #include "chrome/browser/password_manager/password_manager.h"
@@ skipping 23 matching lines @@
  public:
   TestAutofillMetrics() {}
   virtual ~TestAutofillMetrics() {}
 };
 
 }  // anonymous namespace
 
 class TestPasswordGenerationManager : public PasswordGenerationManager {
  public:
   explicit TestPasswordGenerationManager(content::WebContents* contents)
-      : PasswordGenerationManager(contents) {}
+      : PasswordGenerationManager(
+            contents,
+            PasswordManagerDelegateImpl::FromWebContents(contents)) {}
   virtual ~TestPasswordGenerationManager() {}
 
   virtual void SendAccountCreationFormsToRenderer(
       content::RenderViewHost* host,
       const std::vector<autofill::FormData>& forms) OVERRIDE {
     sent_account_creation_forms_.insert(
         sent_account_creation_forms_.begin(), forms.begin(), forms.end());
   }
 
   const std::vector<autofill::FormData>& GetSentAccountCreationForms() {
     return sent_account_creation_forms_;
   }
 
   void ClearSentAccountCreationForms() {
     sent_account_creation_forms_.clear();
   }
 
  private:
   std::vector<autofill::FormData> sent_account_creation_forms_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPasswordGenerationManager);
 };
 
 class PasswordGenerationManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   virtual void SetUp() OVERRIDE {
     SetThreadBundleOptions(content::TestBrowserThreadBundle::REAL_IO_THREAD);
     ChromeRenderViewHostTestHarness::SetUp();
 
+    PasswordManagerDelegateImpl::CreateForWebContents(web_contents());
     password_generation_manager_.reset(
         new TestPasswordGenerationManager(web_contents()));
   }
 
   virtual void TearDown() OVERRIDE {
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   bool IsGenerationEnabled() {
     return password_generation_manager_->IsGenerationEnabled();
@@ skipping 13 matching lines @@
   virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
     // Create an incognito profile.
     TestingProfile::Builder builder;
     builder.SetIncognito();
     scoped_ptr<TestingProfile> profile = builder.Build();
     return profile.release();
   }
 };
 
 TEST_F(PasswordGenerationManagerTest, IsGenerationEnabled) {
-  PasswordManagerDelegateImpl::CreateForWebContents(web_contents());
-  PasswordManager::CreateForWebContentsAndDelegate(
-      web_contents(),
-      PasswordManagerDelegateImpl::FromWebContents(web_contents()));
-
   PrefService* prefs = profile()->GetPrefs();
 
   // Enable syncing. Generation should be enabled.
   prefs->SetBoolean(prefs::kSyncKeepEverythingSynced, false);
   ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetForProfile(
       profile());
   sync_service->SetSyncSetupCompleted();
   syncer::ModelTypeSet preferred_set;
   preferred_set.Put(syncer::PASSWORDS);
   sync_service->ChangePreferredDataTypes(preferred_set);
   EXPECT_TRUE(IsGenerationEnabled());
 
   // Change syncing preferences to not include passwords. Generation should
   // be disabled.
   preferred_set.Put(syncer::EXTENSIONS);
   preferred_set.Remove(syncer::PASSWORDS);
   sync_service->ChangePreferredDataTypes(preferred_set);
   EXPECT_FALSE(IsGenerationEnabled());
 
   // Disable syncing. Generation should also be disabled.
   sync_service->DisableForUser();
   EXPECT_FALSE(IsGenerationEnabled());
 }
 
 TEST_F(PasswordGenerationManagerTest, DetectAccountCreationForms) {
   // Setup so that IsGenerationEnabled() returns true.
-  PasswordManagerDelegateImpl::CreateForWebContents(web_contents());
-  PasswordManager::CreateForWebContentsAndDelegate(
-      web_contents(),
-      PasswordManagerDelegateImpl::FromWebContents(web_contents()));
-
   ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetForProfile(
       profile());
   sync_service->SetSyncSetupCompleted();
 
   autofill::FormData login_form;
   login_form.origin = GURL("http://www.yahoo.com/login/");
   autofill::FormFieldData username;
   username.label = ASCIIToUTF16("username");
   username.name = ASCIIToUTF16("login");
   username.form_control_type = "text";
@@ skipping 37 matching lines @@
             password_generation_manager_->GetSentAccountCreationForms().size());
   EXPECT_EQ(
       GURL("http://accounts.yahoo.com/"),
       password_generation_manager_->GetSentAccountCreationForms()[0].origin);
 }
 
 TEST_F(IncognitoPasswordGenerationManagerTest,
        UpdatePasswordSyncStateIncognito) {
   // Disable password manager by going incognito. Even though syncing is
   // enabled, generation should still be disabled.
-  PasswordManagerDelegateImpl::CreateForWebContents(web_contents());
-  PasswordManager::CreateForWebContentsAndDelegate(
-      web_contents(),
-      PasswordManagerDelegateImpl::FromWebContents(web_contents()));
-
   PrefService* prefs = profile()->GetPrefs();
 
   // Allow this test to control what should get synced.
   prefs->SetBoolean(prefs::kSyncKeepEverythingSynced, false);
 
   browser_sync::SyncPrefs sync_prefs(profile()->GetPrefs());
   sync_prefs.SetSyncSetupCompleted();
   EXPECT_FALSE(IsGenerationEnabled());
 }