Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / password_manager / password_store_factory.cc

diff --git a/src/chrome/browser/password_manager/password_store_factory.cc b/src/chrome/browser/password_manager/password_store_factory.cc
index c0c527a..c4a9d4a 100644 (file)
--- a/src/chrome/browser/password_manager/password_store_factory.cc
+++ b/src/chrome/browser/password_manager/password_store_factory.cc
@@ -7,9 +7,9 @@
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/password_manager/sync_metrics.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
-#include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ -19,11 +19,12 @@
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_default.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/password_store_win.h"
+#include "components/password_manager/core/browser/webdata/password_web_data_service_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/password_manager/password_store_mac.h"
 #include "crypto/apple_keychain.h"
@@ -61,7 +62,7 @@ scoped_refptr<PasswordStore> PasswordStoreService::GetPasswordStore() {
 }
 
 void PasswordStoreService::Shutdown() {
-  if (password_store_)
+  if (password_store_.get())
     password_store_->Shutdown();
 }
 
@@ -148,7 +149,8 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
   ps = new PasswordStoreWin(main_thread_runner,
                             db_thread_runner,
                             login_db.release(),
-                            WebDataService::FromBrowserContext(profile));
+                            WebDataServiceFactory::GetPasswordWebDataForProfile(
+                                profile, Profile::EXPLICIT_ACCESS));
 #elif defined(OS_MACOSX)
   crypto::AppleKeychain* keychain =
       CommandLine::ForCurrentProcess()->HasSwitch(
@@ -225,7 +227,8 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
 #else
   NOTIMPLEMENTED();
 #endif
-  if (!ps || !ps->Init(
+  if (!ps.get() ||
+      !ps->Init(
           sync_start_util::GetFlareForSyncableService(profile->GetPath()))) {
     NOTREACHED() << "Could not initialize password manager.";
     return NULL;