Wire up a LoginDatabase for PasswordStoreMac

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"
@@ skipping 84 matching lines @@
 
 #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"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/keychain_mac.h"
+#include "chrome/browser/password_manager/login_database_mac.h"
 #include "chrome/browser/password_manager/password_store_mac.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,
@@ skipping 718 matching lines @@
 // 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));
 #elif defined(OS_MACOSX)
-  ps = new PasswordStoreMac(new MacKeychain());
+  FilePath login_db_file_path = GetPath();
+  login_db_file_path = login_db_file_path.Append(chrome::kLoginDataFileName);
+  LoginDatabaseMac* login_db = new LoginDatabaseMac();
+  if (!login_db->Init(login_db_file_path)) {
+    LOG(ERROR) << "Could not initialize login database.";
+    delete login_db;
+    return;
+  }
+  ps = new PasswordStoreMac(new MacKeychain(), login_db);
 #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;
@@ skipping 242 matching lines @@
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   return personalization_.get();
 }
 #endif