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

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 379 matching lines @@
                                 bool process_startup,
                                 int* return_code) {
   in_startup = process_startup;
   DCHECK(profile);
 #if defined(OS_CHROMEOS)
   if (process_startup) {
     // NetworkStateNotifier has to be initialized before Launching browser
     // because the page load can happen in parallel to this UI thread
     // and IO thread may access the NetworkStateNotifier.
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()
-        ->AddNetworkManagerObserver(chromeos::NetworkStateNotifier::Get());
+        ->AddNetworkManagerObserver(
+            chromeos::NetworkStateNotifier::GetInstance());
   }
 #endif
 
   // Continue with the off-the-record profile from here on if --incognito
   if (command_line.HasSwitch(switches::kIncognito))
     profile = profile->GetOffTheRecordProfile();
 
   BrowserInit::LaunchWithProfile lwp(cur_dir, command_line, this);
   bool launched = lwp.Launch(profile, process_startup);
   in_startup = false;
 
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code)
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     return false;
   }
 
 #if defined(OS_CHROMEOS)
   // Create the WmMessageListener so that it can listen for messages regardless
   // of what window has focus.
-  chromeos::WmMessageListener::instance();
+  chromeos::WmMessageListener::GetInstance();
 
   // Create the SystemKeyEventListener so it can listen for system keyboard
   // messages regardless of focus.
-  chromeos::SystemKeyEventListener::instance();
+  chromeos::SystemKeyEventListener::GetInstance();
 
   // Create the WmOverviewController so it can register with the listener.
-  chromeos::WmOverviewController::instance();
+  chromeos::WmOverviewController::GetInstance();
 
   // Install the GView request interceptor that will redirect requests
   // of compatible documents (PDF, etc) to the GView document viewer.
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(switches::kEnableGView)) {
     chromeos::GViewRequestInterceptor::GetInstance();
   }
   if (process_startup) {
     // TODO(dhg): Try to make this just USBMountObserver::Get()->set_profile
     // and have the constructor take care of everything else.
     chromeos::MountLibrary* lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
-    chromeos::USBMountObserver* observe = chromeos::USBMountObserver::Get();
+    chromeos::USBMountObserver* observe =
+        chromeos::USBMountObserver::GetInstance();
     lib->AddObserver(observe);
     observe->ScanForDevices(lib);
     // Connect the chromeos notifications
 
     // This observer is a singleton. It is never deleted but the pointer is kept
     // in a static so that it isn't reported as a leak.
     static chromeos::LowBatteryObserver* low_battery_observer =
         new chromeos::LowBatteryObserver(profile);
     chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver(
         low_battery_observer);
@@ skipping 638 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }