Profiles: Really fix refcounted services.

chrome/browser/password_manager/password_store_factory.cc

 // Copyright (c) 2012 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_store_factory.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "chrome/browser/password_manager/login_database.h"
+#include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/password_store_win.h"
 #elif defined(OS_MACOSX)
@@ skipping 13 matching lines @@
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
 namespace {
 
 const LocalProfileId kInvalidLocalProfileId =
     static_cast<LocalProfileId>(0);
 
 }  // namespace
 #endif
 
-PasswordStore* PasswordStoreFactory::GetForProfile(
+scoped_refptr<PasswordStore> PasswordStoreFactory::GetForProfile(
     Profile* profile,
     Profile::ServiceAccessType sat) {
   if (sat == Profile::IMPLICIT_ACCESS && profile->IsOffTheRecord()) {
     NOTREACHED() << "This profile is OffTheRecord";
     return NULL;
   }
 
-  return static_cast<PasswordStore*>(GetInstance()->GetBaseForProfile(
-      profile, true));
+  return static_cast<PasswordStore*>(
+      GetInstance()->GetServiceForProfile(profile, true).get());
 }
 
 // static
 PasswordStoreFactory* PasswordStoreFactory::GetInstance() {
   return Singleton<PasswordStoreFactory>::get();
 }
 
 PasswordStoreFactory::PasswordStoreFactory()
     : RefcountedProfileKeyedServiceFactory(
         "PasswordStore",
@@ skipping 21 matching lines @@
     do {
       id = rand() & kLocalProfileIdMask;
       // TODO(mdm): scan other profiles to make sure they are not using this id?
     } while (id == kInvalidLocalProfileId);
     prefs->SetInteger(prefs::kLocalProfileId, id);
   }
   return id;
 }
 #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
 
-RefcountedProfileKeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
-    Profile* profile) const {
+scoped_refptr<RefcountedProfileKeyedService>
+PasswordStoreFactory::BuildServiceInstanceFor(Profile* profile) const {
   scoped_refptr<PasswordStore> ps;
   FilePath login_db_file_path = profile->GetPath();
   login_db_file_path = login_db_file_path.Append(chrome::kLoginDataFileName);
   LoginDatabase* login_db = new LoginDatabase();
   if (!login_db->Init(login_db_file_path)) {
     LOG(ERROR) << "Could not initialize login database.";
     delete login_db;
     return NULL;
   }
 #if defined(OS_WIN)
@@ skipping 72 matching lines @@
   NOTIMPLEMENTED();
 #endif
   if (!ps)
     delete login_db;
 
   if (!ps || !ps->Init()) {
     NOTREACHED() << "Could not initialize password manager.";
     return NULL;
   }
 
-  return ps.release();
+  return ps;
 }
 
 void PasswordStoreFactory::RegisterUserPrefs(PrefService* prefs) {
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
   prefs->RegisterIntegerPref(prefs::kLocalProfileId,
                              kInvalidLocalProfileId,
                              PrefService::UNSYNCABLE_PREF);
 
   // Notice that the preprocessor conditions above are exactly those that will
   // result in using PasswordStoreX in CreatePasswordStore() below.
   PasswordStoreX::RegisterUserPrefs(prefs);
 #endif
 }
 
 bool PasswordStoreFactory::ServiceRedirectedInIncognito() {
   return true;
 }
 
 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() {
   return true;
 }