Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/chromeos/user_cros_settings_provider.cc

 // Copyright (c) 2010 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/chromeos/user_cros_settings_provider.h"
 
 #include <map>
 #include <set>
 
 #include "base/hash_tables.h"
@@ skipping 139 matching lines @@
   }
 
   prefs->ScheduleSavePersistentPrefs();
 
   return true;
 }
 
 class UserCrosSettingsTrust : public SignedSettingsHelper::Callback,
                               public NotificationObserver {
  public:
-  static UserCrosSettingsTrust* GetSharedInstance() {
+  static UserCrosSettingsTrust* GetInstance() {
     return Singleton<UserCrosSettingsTrust>::get();
   }
 
   // Working horse for UserCrosSettingsProvider::RequestTrusted* family.
   bool RequestTrustedEntity(const std::string& name, Task* callback) {
     if (GetOwnershipStatus() == OWNERSHIP_NONE)
       return true;
     if (GetOwnershipStatus() == OWNERSHIP_TAKEN) {
       DCHECK(g_browser_process);
       PrefService* prefs = g_browser_process->local_state();
@@ skipping 260 matching lines @@
 }  // namespace chromeos
 
 // We want to use NewRunnableMethod with this class but need to disable
 // reference counting since it is singleton.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::UserCrosSettingsTrust);
 
 namespace chromeos {
 
 UserCrosSettingsProvider::UserCrosSettingsProvider() {
   // Trigger prefetching of settings.
-  UserCrosSettingsTrust::GetSharedInstance();
+  UserCrosSettingsTrust::GetInstance();
 }
 
 // static
 void UserCrosSettingsProvider::RegisterPrefs(PrefService* local_state) {
   for (size_t i = 0; i < arraysize(kBooleanSettings); ++i)
     RegisterSetting(local_state, kBooleanSettings[i]);
   for (size_t i = 0; i < arraysize(kStringSettings); ++i)
     RegisterSetting(local_state, kStringSettings[i]);
   for (size_t i = 0; i < arraysize(kListSettings); ++i)
     RegisterSetting(local_state, kListSettings[i]);
 }
 
 bool UserCrosSettingsProvider::RequestTrustedAllowGuest(Task* callback) {
-  return UserCrosSettingsTrust::GetSharedInstance()->RequestTrustedEntity(
+  return UserCrosSettingsTrust::GetInstance()->RequestTrustedEntity(
       kAccountsPrefAllowGuest, callback);
 }
 
 bool UserCrosSettingsProvider::RequestTrustedAllowNewUser(Task* callback) {
-  return UserCrosSettingsTrust::GetSharedInstance()->RequestTrustedEntity(
+  return UserCrosSettingsTrust::GetInstance()->RequestTrustedEntity(
       kAccountsPrefAllowNewUser, callback);
 }
 
 bool UserCrosSettingsProvider::RequestTrustedShowUsersOnSignin(Task* callback) {
-  return UserCrosSettingsTrust::GetSharedInstance()->RequestTrustedEntity(
+  return UserCrosSettingsTrust::GetInstance()->RequestTrustedEntity(
       kAccountsPrefShowUserNamesOnSignIn, callback);
 }
 
 bool UserCrosSettingsProvider::RequestTrustedOwner(Task* callback) {
-  return UserCrosSettingsTrust::GetSharedInstance()->RequestTrustedEntity(
+  return UserCrosSettingsTrust::GetInstance()->RequestTrustedEntity(
       kDeviceOwner, callback);
 }
 
 // static
 bool UserCrosSettingsProvider::cached_allow_guest() {
   // Trigger prefetching if singleton object still does not exist.
-  UserCrosSettingsTrust::GetSharedInstance();
+  UserCrosSettingsTrust::GetInstance();
   return g_browser_process->local_state()->GetBoolean(kAccountsPrefAllowGuest);
 }
 
 // static
 bool UserCrosSettingsProvider::cached_allow_new_user() {
   // Trigger prefetching if singleton object still does not exist.
-  UserCrosSettingsTrust::GetSharedInstance();
+  UserCrosSettingsTrust::GetInstance();
   return g_browser_process->local_state()->GetBoolean(
     kAccountsPrefAllowNewUser);
 }
 
 // static
 bool UserCrosSettingsProvider::cached_show_users_on_signin() {
   // Trigger prefetching if singleton object still does not exist.
-  UserCrosSettingsTrust::GetSharedInstance();
+  UserCrosSettingsTrust::GetInstance();
   return g_browser_process->local_state()->GetBoolean(
       kAccountsPrefShowUserNamesOnSignIn);
 }
 
 // static
 const ListValue* UserCrosSettingsProvider::cached_whitelist() {
   PrefService* prefs = g_browser_process->local_state();
   const ListValue* cached_users = prefs->GetList(kAccountsPrefUsers);
 
   if (!cached_users) {
     // Update whitelist cache.
     GetUserWhitelist(NULL);
 
     cached_users = prefs->GetList(kAccountsPrefUsers);
   }
 
   return cached_users;
 }
 
 // static
 std::string UserCrosSettingsProvider::cached_owner() {
   // Trigger prefetching if singleton object still does not exist.
-  UserCrosSettingsTrust::GetSharedInstance();
+  UserCrosSettingsTrust::GetInstance();
   if (!g_browser_process || !g_browser_process->local_state())
     return std::string();
   return g_browser_process->local_state()->GetString(kDeviceOwner);
 }
 
 // static
 bool UserCrosSettingsProvider::IsEmailInCachedWhitelist(
     const std::string& email) {
   const ListValue* whitelist = cached_whitelist();
   if (whitelist) {
     StringValue email_value(email);
     for (ListValue::const_iterator i(whitelist->begin());
         i != whitelist->end(); ++i) {
       if ((*i)->Equals(&email_value))
         return true;
     }
   }
   return false;
 }
 
 void UserCrosSettingsProvider::DoSet(const std::string& path,
                                      Value* in_value) {
-  UserCrosSettingsTrust::GetSharedInstance()->Set(path, in_value);
+  UserCrosSettingsTrust::GetInstance()->Set(path, in_value);
 }
 
 bool UserCrosSettingsProvider::Get(const std::string& path,
                                    Value** out_value) const {
   if (IsControlledBooleanSetting(path)) {
     *out_value = CreateSettingsBooleanValue(
         g_browser_process->local_state()->GetBoolean(path.c_str()),
         !UserManager::Get()->current_user_is_owner());
     return true;
   } else if (path == kAccountsPrefUsers) {
     ListValue* user_list = new ListValue;
     GetUserWhitelist(user_list);
     *out_value = user_list;
     return true;
   }
 
   return false;
 }
 
 bool UserCrosSettingsProvider::HandlesSetting(const std::string& path) {
   return ::StartsWithASCII(path, "cros.accounts.", true);
 }
 
 void UserCrosSettingsProvider::WhitelistUser(const std::string& email) {
   SignedSettingsHelper::Get()->StartWhitelistOp(
-      email, true, UserCrosSettingsTrust::GetSharedInstance());
+      email, true, UserCrosSettingsTrust::GetInstance());
   PrefService* prefs = g_browser_process->local_state();
   ListValue* cached_whitelist = prefs->GetMutableList(kAccountsPrefUsers);
   cached_whitelist->Append(Value::CreateStringValue(email));
   prefs->ScheduleSavePersistentPrefs();
 }
 
 void UserCrosSettingsProvider::UnwhitelistUser(const std::string& email) {
   SignedSettingsHelper::Get()->StartWhitelistOp(
-      email, false, UserCrosSettingsTrust::GetSharedInstance());
+      email, false, UserCrosSettingsTrust::GetInstance());
 
   PrefService* prefs = g_browser_process->local_state();
   ListValue* cached_whitelist = prefs->GetMutableList(kAccountsPrefUsers);
   StringValue email_value(email);
   if (cached_whitelist->Remove(email_value) != -1)
     prefs->ScheduleSavePersistentPrefs();
 }
 
 // static
 void UserCrosSettingsProvider::UpdateCachedOwner(const std::string& email) {
   UpdateCacheString(kDeviceOwner, email, USE_VALUE_SUPPLIED);
 }
 
 }  // namespace chromeos