Reverting 17273 - Fails reliability tests

Review URL: http://codereview.chromium.org/118047

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

11 files changed, 158 insertions, 196 deletions

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 68b52be..a3e8cbc 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -140,42 +140,5 @@
         ],
       },
     },
-# TODO(evanm): temporarily disabled while we figure out whether to depend
-# on gnome-keyring etc.
-# http://code.google.com/p/chromium/issues/detail?id=12351
-#     {
-#       'target_name': 'gnome-keyring',
-#       'type': 'settings',
-#       'direct_dependent_settings': {
-#         'cflags': [
-#           '<!@(pkg-config --cflags gnome-keyring-1)',
-#         ],
-#       },
-#       'link_settings': {
-#         'ldflags': [
-#           '<!@(pkg-config --libs-only-L --libs-only-other gnome-keyring-1)',
-#         ],
-#         'libraries': [
-#           '<!@(pkg-config --libs-only-l gnome-keyring-1)',
-#         ],
-#       },
-#     },
-#     {
-#       'target_name': 'dbus-glib',
-#       'type': 'settings',
-#       'direct_dependent_settings': {
-#         'cflags': [
-#           '<!@(pkg-config --cflags dbus-glib-1)',
-#         ],
-#       },
-#       'link_settings': {
-#         'ldflags': [
-#           '<!@(pkg-config --libs-only-L --libs-only-other dbus-glib-1)',
-#         ],
-#         'libraries': [
-#           '<!@(pkg-config --libs-only-l dbus-glib-1)',
-#         ],
-#       },
-#     },
   ],
 }
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index b79c44b..7ecaab2 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="browser"
 	ProjectGUID="{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}"
 	RootNamespace="Browser"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -1532,31 +1533,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\password_manager\password_manager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\password_manager\password_manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\password_manager\password_store.cc"
+				RelativePath=".\password_manager\password_form_manager_win.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\password_manager\password_store.h"
-				>
-			</File>
-			<File
-				RelativePath=".\password_manager\password_store_default.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\password_manager\password_store_default.h"
+				RelativePath=".\password_manager\password_manager.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\password_manager\password_store_win.cc"
+				RelativePath=".\password_manager\password_manager.h"
 				>
 			</File>
 			<File
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 26ebd4c..cf40a1b 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -21,7 +21,7 @@ PasswordFormManager::PasswordFormManager(Profile* profile,
       observed_form_(observed_form),
       is_new_login_(true),
       password_manager_(password_manager),
-      pending_login_query_(0),
+      pending_login_query_(NULL),
       preferred_match_(NULL),
       state_(PRE_MATCHING_PHASE),
       profile_(profile) {
@@ -168,21 +168,25 @@ void PasswordFormManager::FetchMatchingLoginsFromWebDatabase() {
   DCHECK_EQ(state_, PRE_MATCHING_PHASE);
   DCHECK(!pending_login_query_);
   state_ = MATCHING_PHASE;
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
-  if (!password_store) {
+  WebDataService* web_data_service =
+      profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+  if (!web_data_service) {
     NOTREACHED();
     return;
   }
-  pending_login_query_ = password_store->GetLogins(observed_form_, this);
+  pending_login_query_ = web_data_service->GetLogins(observed_form_, this);
 }
 
 bool PasswordFormManager::HasCompletedMatching() {
   return state_ == POST_MATCHING_PHASE;
 }
 
-void PasswordFormManager::OnRequestDone(int handle,
-    const std::vector<PasswordForm*>& logins_result) {
+void PasswordFormManager::OnRequestDone(WebDataService::Handle h,
+    const WDTypedResult* result) {
+  // Get the result from the database into a usable form.
+  const WDResult<std::vector<PasswordForm*> >* r =
+      static_cast<const WDResult<std::vector<PasswordForm*> >*>(result);
+  std::vector<PasswordForm*> logins_result = r->GetValue();
   // Note that the result gets deleted after this call completes, but we own
   // the PasswordForm objects pointed to by the result vector, thus we keep
   // copies to a minimum here.
@@ -235,6 +239,14 @@ void PasswordFormManager::OnRequestDone(int handle,
   // We're done matching now.
   state_ = POST_MATCHING_PHASE;
 
+  if (best_score <= 0) {
+#if defined(OS_WIN)
+    state_ = PRE_MATCHING_PHASE;
+    FetchMatchingIE7LoginFromWebDatabase();
+#endif
+    return;
+  }
+
   for (std::vector<PasswordForm>::const_iterator it = empties.begin();
        it != empties.end(); ++it) {
     // If we don't already have a result with the same username, add the
@@ -260,17 +272,30 @@ void PasswordFormManager::OnRequestDone(int handle,
   }
 }
 
-void PasswordFormManager::OnPasswordStoreRequestDone(
-    int handle, const std::vector<PasswordForm*>& result) {
+void PasswordFormManager::OnWebDataServiceRequestDone(WebDataService::Handle h,
+    const WDTypedResult* result) {
   DCHECK_EQ(state_, MATCHING_PHASE);
-  DCHECK_EQ(pending_login_query_, handle);
+  DCHECK_EQ(pending_login_query_, h);
+  DCHECK(result);
+  pending_login_query_ = NULL;
 
-  if (result.empty()) {
-    state_ = POST_MATCHING_PHASE;
+  if (!result)
     return;
-  }
 
-  OnRequestDone(handle, result);
+  switch (result->GetType()) {
+    case PASSWORD_RESULT: {
+      OnRequestDone(h, result);
+      break;
+    }
+#if defined(OS_WIN)
+    case PASSWORD_IE7_RESULT: {
+      OnIE7RequestDone(h, result);
+      break;
+    }
+#endif
+    default:
+      NOTREACHED();
+  }
 }
 
 bool PasswordFormManager::IgnoreResult(const PasswordForm& form) const {
@@ -297,15 +322,14 @@ void PasswordFormManager::SaveAsNewLogin() {
 
   DCHECK(!profile_->IsOffTheRecord());
 
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS);
-  if (!password_store) {
+  WebDataService* web_data_service =
+      profile_->GetWebDataService(Profile::IMPLICIT_ACCESS);
+  if (!web_data_service) {
     NOTREACHED();
     return;
   }
-
   pending_credentials_.date_created = Time::Now();
-  password_store->AddLogin(pending_credentials_);
+  web_data_service->AddLogin(pending_credentials_);
 }
 
 void PasswordFormManager::UpdateLogin() {
@@ -317,9 +341,9 @@ void PasswordFormManager::UpdateLogin() {
   DCHECK(!IsNewLogin() && pending_credentials_.preferred);
   DCHECK(!profile_->IsOffTheRecord());
 
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS);
-  if (!password_store) {
+  WebDataService* web_data_service =
+      profile_->GetWebDataService(Profile::IMPLICIT_ACCESS);
+  if (!web_data_service) {
     NOTREACHED();
     return;
   }
@@ -331,7 +355,7 @@ void PasswordFormManager::UpdateLogin() {
          iter->second->preferred) {
       // This wasn't the selected login but it used to be preferred.
       iter->second->preferred = false;
-      password_store->UpdateLogin(*iter->second);
+      web_data_service->UpdateLogin(*iter->second);
     }
   }
   // Update the new preferred login.
@@ -356,20 +380,23 @@ void PasswordFormManager::UpdateLogin() {
     PasswordForm copy(pending_credentials_);
     copy.origin = observed_form_.origin;
     copy.action = observed_form_.action;
-    password_store->AddLogin(copy);
+    web_data_service->AddLogin(copy);
   } else {
-    password_store->UpdateLogin(pending_credentials_);
+    web_data_service->UpdateLogin(pending_credentials_);
   }
 }
 
 void PasswordFormManager::CancelLoginsQuery() {
-  PasswordStore* password_store =
-      profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS);
-  if (!password_store) {
-    // Can be NULL in unit tests.
+  if (!pending_login_query_)
+    return;
+  WebDataService* web_data_service =
+      profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+  if (!web_data_service) {
+    NOTREACHED();
     return;
   }
-  password_store->CancelLoginsQuery(pending_login_query_);
+  web_data_service->CancelRequest(pending_login_query_);
+  pending_login_query_ = NULL;
 }
 
 int PasswordFormManager::ScoreResult(const PasswordForm& candidate) const {
diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 90ffc86..332eea3 100644
--- a/chrome/browser/password_manager/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_manager.h
@@ -8,7 +8,6 @@
 #include "build/build_config.h"
 
 #include "base/stl_util-inl.h"
-#include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "webkit/glue/password_form.h"
 
@@ -17,7 +16,7 @@ class Profile;
 
 // Per-password-form-{on-page, dialog} class responsible for interactions
 // between a given form, the per-tab PasswordManager, and the web database.
-class PasswordFormManager : public PasswordStoreConsumer {
+class PasswordFormManager : public WebDataServiceConsumer {
  public:
   // web_data_service allows access to current profile's Web Data
   // password_manager owns this object
@@ -35,6 +34,9 @@ class PasswordFormManager : public PasswordStoreConsumer {
 
   // Retrieves potential matching logins from the database.
   void FetchMatchingLoginsFromWebDatabase();
+#if defined(OS_WIN)
+  void FetchMatchingIE7LoginFromWebDatabase();
+#endif
 
   // Simple state-check to verify whether this object as received a callback
   // from the web database and completed its matching phase. Note that the
@@ -58,12 +60,19 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // managed by this.
   bool IsNewLogin();
 
+  // WebDataServiceConsumer implementation. If matches were found
+  // (in *result), this is where we determine we need to autofill.
+  virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
+                                           const WDTypedResult* result);
+
   // Determines if we need to autofill given the results of the query.
-  void OnRequestDone(int handle, const std::vector<PasswordForm*>& result);
+  void OnRequestDone(WebDataService::Handle h, const WDTypedResult* result);
 
-  // PasswordStoreConsumer implementation.
-  virtual void OnPasswordStoreRequestDone(
-      int handle, const std::vector<PasswordForm*>& result);
+#if defined(OS_WIN)
+  // Determines if we need to autofill given the results of the query in the
+  // ie7_password table.
+  void OnIE7RequestDone(WebDataService::Handle h, const WDTypedResult* result);
+#endif
 
   // A user opted to 'never remember' passwords for this form.
   // Blacklist it so that from now on when it is seen we ignore it.
@@ -132,7 +141,7 @@ class PasswordFormManager : public PasswordStoreConsumer {
   const PasswordManager* const password_manager_;
 
   // Handle to any pending WebDataService::GetLogins query.
-  int pending_login_query_;
+  WebDataService::Handle pending_login_query_;
 
   // Convenience pointer to entry in best_matches_ that is marked
   // as preferred. This is only allowed to be null if there are no best matches
diff --git a/chrome/browser/password_manager/password_form_manager_win.cc b/chrome/browser/password_manager/password_form_manager_win.cc
index e69de29..a075617 100644
--- a/chrome/browser/password_manager/password_form_manager_win.cc
+++ b/chrome/browser/password_manager/password_form_manager_win.cc
@@ -0,0 +1,77 @@
+// Copyright (c) 2009 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 "chrome/browser/password_manager/password_form_manager.h"
+
+#include "base/string_util.h"
+#include "chrome/browser/password_manager/ie7_password.h"
+#include "chrome/browser/password_manager/password_manager.h"
+#include "chrome/browser/profile.h"
+
+void PasswordFormManager::FetchMatchingIE7LoginFromWebDatabase() {
+  DCHECK_EQ(state_, PRE_MATCHING_PHASE);
+  DCHECK(!pending_login_query_);
+  state_ = MATCHING_PHASE;
+  WebDataService* web_data_service =
+      profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+  if (!web_data_service) {
+    NOTREACHED();
+   return;
+  }
+
+  IE7PasswordInfo info;
+  std::wstring url = ASCIIToWide(observed_form_.origin.spec());
+  info.url_hash = ie7_password::GetUrlHash(url);
+  pending_login_query_ = web_data_service->GetIE7Login(info, this);
+}
+
+void PasswordFormManager::OnIE7RequestDone(WebDataService::Handle h,
+    const WDTypedResult* result) {
+  // Get the result from the database into a usable form.
+  const WDResult<IE7PasswordInfo>* r =
+      static_cast<const WDResult<IE7PasswordInfo>*>(result);
+  IE7PasswordInfo result_value = r->GetValue();
+
+  state_ = POST_MATCHING_PHASE;
+
+  if (!result_value.encrypted_data.empty()) {
+    // We got a result.
+    // Delete the entry. If it's good we will add it to the real saved password
+    // table.
+    WebDataService* web_data_service =
+        profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+    if (!web_data_service) {
+      NOTREACHED();
+     return;
+    }
+    web_data_service->RemoveIE7Login(result_value);
+
+    std::wstring username;
+    std::wstring password;
+    std::wstring url = ASCIIToWide(observed_form_.origin.spec());
+    if (!ie7_password::DecryptPassword(url, result_value.encrypted_data,
+                                       &username, &password)) {
+      return;
+    }
+
+    PasswordForm* auto_fill = new PasswordForm(observed_form_);
+    auto_fill->username_value = username;
+    auto_fill->password_value = password;
+    auto_fill->preferred = true;
+    auto_fill->ssl_valid = observed_form_.origin.SchemeIsSecure();
+    auto_fill->date_created = result_value.date_created;
+    // Add this PasswordForm to the saved password table.
+    web_data_service->AddLogin(*auto_fill);
+
+    if (IgnoreResult(*auto_fill)) {
+      delete auto_fill;
+      return;
+    }
+
+    best_matches_[auto_fill->username_value] = auto_fill;
+    preferred_match_ = auto_fill;
+    password_manager_->Autofill(observed_form_, best_matches_,
+                                preferred_match_);
+  }
+}
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index e09aa08..b558bf94 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -8,7 +8,6 @@
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
@@ -235,9 +234,8 @@ void PasswordManager::Autofill(
       return;
     }
     default:
-      if (observer_) {
+      if (observer_)
         observer_->OnAutofillDataAvailable(preferred_match->username_value,
                                            preferred_match->password_value);
-      }
   }
 }
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index 175e4cd..9c80714 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.h
@@ -7,13 +7,13 @@
 
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
+#include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/pref_member.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/password_form_dom_manager.h"
 
-class PasswordFormManager;
 class PrefService;
 class TabContents;
 
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 718b2c81..e5d007e 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
-#include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
@@ -89,14 +88,6 @@ URLRequestContext* Profile::GetDefaultRequestContext() {
   return default_request_context_;
 }
 
-#if defined(OS_LINUX)
-// Temporarily disabled while we figure some stuff out.
-// http://code.google.com/p/chromium/issues/detail?id=12351
-// #include "chrome/browser/password_manager/password_store_gnome.h"
-// #include "chrome/browser/password_manager/password_store_kwallet.h"
-#elif defined(OS_WIN)
-#include "chrome/browser/password_manager/password_store_win.h"
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -198,15 +189,6 @@ class OffTheRecordProfileImpl : public Profile,
     }
   }
 
-  virtual PasswordStore* GetPasswordStore(ServiceAccessType sat) {
-    if (sat == EXPLICIT_ACCESS) {
-      return profile_->GetPasswordStore(sat);
-    } else {
-      NOTREACHED() << "This profile is OffTheRecord";
-      return NULL;
-    }
-  }
-
   virtual PrefService* GetPrefs() {
     return profile_->GetPrefs();
   }
@@ -407,7 +389,6 @@ ProfileImpl::ProfileImpl(const FilePath& path)
       extensions_request_context_(NULL),
       history_service_created_(false),
       created_web_data_service_(false),
-      created_password_store_(false),
       created_download_manager_(false),
       created_theme_provider_(false),
       start_time_(Time::Now()),
@@ -781,41 +762,6 @@ void ProfileImpl::CreateWebDataService() {
   web_data_service_.swap(wds);
 }
 
-PasswordStore* ProfileImpl::GetPasswordStore(ServiceAccessType sat) {
-  if (!created_password_store_)
-    CreatePasswordStore();
-  return password_store_.get();
-}
-
-void ProfileImpl::CreatePasswordStore() {
-  DCHECK(!created_password_store_ && password_store_.get() == NULL);
-  created_password_store_ = true;
-  scoped_refptr<PasswordStore> ps;
-#if defined(OS_LINUX)
-// Temporarily disabled while we figure some stuff out.
-// http://code.google.com/p/chromium/issues/detail?id=12351
-// if (getenv("KDE_FULL_SESSION")) {
-//   ps = new PasswordStoreKWallet();
-// } else {
-//   ps = new PasswordStoreGnome();
-// }
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
-  ps = new PasswordStoreWin(GetWebDataService(Profile::IMPLICIT_ACCESS));
-#else
-  NOTIMPLEMENTED();
-#endif
-  if (!ps || !ps->Init()) {
-    // Try falling back to the default password manager
-    LOG(WARNING) << "Could not initialise native password manager - "
-                    "falling back to default";
-    ps = new PasswordStoreDefault(GetWebDataService(Profile::IMPLICIT_ACCESS));
-    if (!ps->Init())
-      return;
-  }
-  password_store_.swap(ps);
-}
-
 DownloadManager* ProfileImpl::GetDownloadManager() {
   if (!created_download_manager_) {
     scoped_refptr<DownloadManager> dlm(new DownloadManager);
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index d5e800f..1ee1a19 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -31,7 +31,6 @@ class ExtensionProcessManager;
 class ExtensionsService;
 class HistoryService;
 class NavigationController;
-class PasswordStore;
 class PrefService;
 class SessionService;
 class SpellChecker;
@@ -158,9 +157,6 @@ class Profile {
   // the ServiceAccessType definition above.
   virtual WebDataService* GetWebDataService(ServiceAccessType access) = 0;
 
-  // Returns the PasswordStore for this profile. This is owned by the Profile.
-  virtual PasswordStore* GetPasswordStore(ServiceAccessType access) = 0;
-
   // Retrieves a pointer to the PrefService that manages the preferences
   // for this user profile.  The PrefService is lazily created the first
   // time that this method is called.
@@ -318,7 +314,6 @@ class ProfileImpl : public Profile,
   virtual ExtensionProcessManager* GetExtensionProcessManager();
   virtual HistoryService* GetHistoryService(ServiceAccessType sat);
   virtual WebDataService* GetWebDataService(ServiceAccessType sat);
-  virtual PasswordStore* GetPasswordStore(ServiceAccessType sat);
   virtual PrefService* GetPrefs();
   virtual TemplateURLModel* GetTemplateURLModel();
   virtual TemplateURLFetcher* GetTemplateURLFetcher();
@@ -364,8 +359,6 @@ class ProfileImpl : public Profile,
   void CreateWebDataService();
   FilePath GetPrefFilePath();
 
-  void CreatePasswordStore();
-
   void StopCreateSessionServiceTimer();
 
   void EnsureSessionServiceCreated() {
@@ -408,12 +401,10 @@ class ProfileImpl : public Profile,
   scoped_refptr<DownloadManager> download_manager_;
   scoped_refptr<HistoryService> history_service_;
   scoped_refptr<WebDataService> web_data_service_;
-  scoped_refptr<PasswordStore> password_store_;
   scoped_refptr<SessionService> session_service_;
   scoped_refptr<BrowserThemeProvider> theme_provider_;
   bool history_service_created_;
   bool created_web_data_service_;
-  bool created_password_store_;
   bool created_download_manager_;
   bool created_theme_provider_;
   // Whether or not the last session exited cleanly. This is set only once.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b0d256d..87dc67c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1091,23 +1091,9 @@
         'browser/password_manager/ie7_password.h',
         'browser/password_manager/password_form_manager.cc',
         'browser/password_manager/password_form_manager.h',
+        'browser/password_manager/password_form_manager_win.cc',
         'browser/password_manager/password_manager.cc',
         'browser/password_manager/password_manager.h',
-        'browser/password_manager/password_store.cc',
-        'browser/password_manager/password_store.h',
-        'browser/password_manager/password_store_default.cc',
-        'browser/password_manager/password_store_default.h',
-        # Temporarily disabled while we figure some stuff out.
-        # http://code.google.com/p/chromium/issues/detail?id=12351
-        # 'browser/password_manager/password_store_gnome.h',
-        # 'browser/password_manager/password_store_gnome.cc',
-        # 'browser/password_manager/password_store_kwallet.h',
-        # 'browser/password_manager/password_store_kwallet.cc',
-        'browser/password_manager/password_store_mac_internal.h',
-        'browser/password_manager/password_store_mac.h',
-        'browser/password_manager/password_store_mac.cc',
-        'browser/password_manager/password_store_win.h',
-        'browser/password_manager/password_store_win.cc',
         'browser/plugin_installer.cc',
         'browser/plugin_installer.h',
         'browser/plugin_process_host.cc',
@@ -1567,10 +1553,6 @@
         }],
         ['OS=="linux"', {
           'dependencies': [
-            # Temporarily disabled while we figure some stuff out.
-            # http://code.google.com/p/chromium/issues/detail?id=12351
-            # '../build/linux/system.gyp:dbus-glib',
-            # '../build/linux/system.gyp:gnome-keyring',
             '../build/linux/system.gyp:gtk',
           ],
           'sources!': [
@@ -1579,8 +1561,6 @@
             'browser/extensions/extension_view.cc',
             'browser/extensions/extension_view.h',
                     # Windows-specific files.
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
           ],
           'conditions': [
             ['linux_breakpad==1', {
@@ -1623,12 +1603,6 @@
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
-            'browser/password_manager/password_store_gnome.h',
-            'browser/password_manager/password_store_gnome.cc',
-            'browser/password_manager/password_store_kwallet.h',
-            'browser/password_manager/password_store_kwallet.cc',
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
             'browser/extensions/extension_shelf.cc',
             'browser/extensions/extension_shelf.h',
             'browser/extensions/extension_view.cc',
@@ -1680,10 +1654,6 @@
           ],
           'sources!': [
             'browser/history/history_publisher_none.cc',
-            'browser/password_manager/password_store_gnome.h',
-            'browser/password_manager/password_store_gnome.cc',
-            'browser/password_manager/password_store_kwallet.h',
-            'browser/password_manager/password_store_kwallet.cc',
           ],
           'configurations': {
             'Debug': {
@@ -3139,7 +3109,6 @@
         'browser/net/url_fixer_upper_unittest.cc',
         'browser/password_manager/encryptor_unittest.cc',
         'browser/password_manager/password_form_manager_unittest.cc',
-        'browser/password_manager/password_store_mac_unittest.cc',
         'browser/printing/page_number_unittest.cc',
         'browser/printing/page_overlays_unittest.cc',
         'browser/printing/page_range_unittest.cc',
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 7abdd8f..974d31d 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -102,9 +102,6 @@ class TestingProfile : public Profile {
   virtual WebDataService* GetWebDataService(ServiceAccessType access) {
     return NULL;
   }
-  virtual PasswordStore* GetPasswordStore(ServiceAccessType access) {
-    return NULL;
-  }
   virtual PrefService* GetPrefs() {
     FilePath prefs_filename;
     PathService::Get(base::DIR_TEMP, &prefs_filename);