Revert the password manager refactoring -- it failed reliability tests.

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #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"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/visitedlink_master.h"
@@ skipping 49 matching lines @@
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   return new ProfileImpl(path);
 }
 
 // static
 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
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OffTheRecordProfileImpl is a profile subclass that wraps an existing profile
 // to make it suitable for the off the record mode.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class OffTheRecordProfileImpl : public Profile,
                                 public NotificationObserver {
  public:
@@ skipping 83 matching lines @@
 
   virtual WebDataService* GetWebDataService(ServiceAccessType sat) {
     if (sat == EXPLICIT_ACCESS) {
       return profile_->GetWebDataService(sat);
     } else {
       NOTREACHED() << "This profile is OffTheRecord";
       return NULL;
     }
   }
 
-  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();
   }
 
   virtual TemplateURLModel* GetTemplateURLModel() {
     return profile_->GetTemplateURLModel();
   }
 
   virtual TemplateURLFetcher* GetTemplateURLFetcher() {
     return profile_->GetTemplateURLFetcher();
@@ skipping 201 matching lines @@
   DISALLOW_EVIL_CONSTRUCTORS(OffTheRecordProfileImpl);
 };
 
 ProfileImpl::ProfileImpl(const FilePath& path)
     : path_(path),
       request_context_(NULL),
       media_request_context_(NULL),
       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()),
       spellchecker_(NULL),
       shutdown_session_service_(false) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
@@ skipping 353 matching lines @@
 
 void ProfileImpl::CreateWebDataService() {
   DCHECK(!created_web_data_service_ && web_data_service_.get() == NULL);
   created_web_data_service_ = true;
   scoped_refptr<WebDataService> wds(new WebDataService());
   if (!wds->Init(GetPath()))
     return;
   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);
     dlm->Init(this);
     created_download_manager_ = true;
     download_manager_.swap(dlm);
   }
   return download_manager_.get();
 }
 
@@ skipping 213 matching lines @@
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   return personalization_.get();
 }
 #endif