Eliminate PasswordManager's dependence on WebContents.

As part of componentizing the password manager, we need to remove all
references to content/.

BUG=340661

Review URL: https://codereview.chromium.org/133073017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249958 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 29 deletions

diff --git a/chrome/browser/password_manager/content_password_manager_driver.cc b/chrome/browser/password_manager/content_password_manager_driver.cc
index d1ac71d..e164a20 100644
--- a/chrome/browser/password_manager/content_password_manager_driver.cc
+++ b/chrome/browser/password_manager/content_password_manager_driver.cc
@@ -21,7 +21,7 @@ ContentPasswordManagerDriver::ContentPasswordManagerDriver(
     content::WebContents* web_contents,
     PasswordManagerDelegate* delegate)
     : WebContentsObserver(web_contents),
-      password_manager_(web_contents, delegate),
+      password_manager_(delegate),
       password_generation_manager_(web_contents, delegate) {
   DCHECK(web_contents);
 }
diff --git a/chrome/browser/password_manager/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc
index 590f5fe..d4d9ccf 100644
--- a/chrome/browser/password_manager/password_form_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_form_manager_unittest.cc
@@ -70,7 +70,7 @@ class TestPasswordManagerDelegate : public PasswordManagerDelegate {
 class TestPasswordManager : public PasswordManager {
  public:
   explicit TestPasswordManager(PasswordManagerDelegate* delegate)
-      : PasswordManager(NULL, delegate) {}
+      : PasswordManager(delegate) {}
 
   virtual void Autofill(
       const autofill::PasswordForm& form_for_autofill,
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 21531d8a..1b473ce 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -14,25 +14,15 @@
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/password_manager/password_manager_driver.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/password_autofill_util.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/user_metrics.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/frame_navigate_params.h"
 #include "grit/generated_resources.h"
 
 using autofill::PasswordForm;
 using autofill::PasswordFormMap;
-using base::UserMetricsAction;
-using content::WebContents;
 
 namespace {
 
@@ -77,10 +67,8 @@ void PasswordManager::RegisterProfilePrefs(
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
-PasswordManager::PasswordManager(WebContents* web_contents,
-                                 PasswordManagerDelegate* delegate)
-    : web_contents_(web_contents),
-      delegate_(delegate),
+PasswordManager::PasswordManager(PasswordManagerDelegate* delegate)
+    : delegate_(delegate),
       driver_(delegate->GetDriver()) {
   DCHECK(delegate_);
   DCHECK(driver_);
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index 1b3d36b..64e2a57 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.h
@@ -44,8 +44,7 @@ class PasswordManager : public LoginModel {
 #if defined(OS_WIN)
   static void RegisterLocalPrefs(PrefRegistrySimple* registry);
 #endif
-  PasswordManager(content::WebContents* web_contents,
-                  PasswordManagerDelegate* delegate);
+  explicit PasswordManager(PasswordManagerDelegate* delegate);
   virtual ~PasswordManager();
 
   typedef base::Callback<void(const autofill::PasswordForm&)>
@@ -157,12 +156,6 @@ class PasswordManager : public LoginModel {
   // time a user submits a login form and gets to the next page.
   scoped_ptr<PasswordFormManager> provisional_save_manager_;
 
-  // The WebContents instance associated with this instance. Scoped to the
-  // lifetime of this class, as this class is indirectly a WCUD via
-  // PasswordManagerDelegateImpl.
-  // TODO(blundell): Eliminate this ivar. crbug.com/340661
-  content::WebContents* web_contents_;
-
   // The embedder-level client. Must outlive this class.
   PasswordManagerDelegate* const delegate_;
 
diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc
index 66536de..5d2925e 100644
--- a/chrome/browser/password_manager/password_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_manager_unittest.cc
@@ -19,7 +19,6 @@
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/password_manager/core/browser/password_store.h"
-#include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -71,9 +70,8 @@ ACTION_P(SaveToScopedPtr, scoped) {
 
 class TestPasswordManager : public PasswordManager {
  public:
-  TestPasswordManager(content::WebContents* contents,
-                      PasswordManagerDelegate* delegate)
-      : PasswordManager(contents, delegate) {}
+  explicit TestPasswordManager(PasswordManagerDelegate* delegate)
+      : PasswordManager(delegate) {}
   virtual ~TestPasswordManager() {}
 
   virtual void OnPasswordFormSubmitted(const PasswordForm& form) OVERRIDE {
@@ -101,7 +99,7 @@ class PasswordManagerTest : public ChromeRenderViewHostTestHarness {
         WillRepeatedly(Return(profile()->GetTestingPrefService()));
     EXPECT_CALL(delegate_, GetDriver()).WillRepeatedly(Return(&driver_));
 
-    manager_.reset(new TestPasswordManager(web_contents(), &delegate_));
+    manager_.reset(new TestPasswordManager(&delegate_));
 
     EXPECT_CALL(driver_, DidLastPageLoadEncounterSSLErrors())
         .WillRepeatedly(Return(false));