Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

chrome/browser/chromeos/login/login_utils.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/login/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"

[joth, 2010/12/09 15:06:40]

remove, fwd declare traits

 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ skipping 110 matching lines @@
   void RespectLocalePreference(PrefService* pref);
 
   // Indicates if DoBrowserLaunch will actually launch the browser or not.
   bool browser_launch_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
 };
 
 class LoginUtilsWrapper {
  public:
-  LoginUtilsWrapper() {}
+  static LoginUtilsWrapper* GetInstance() {
+    return Singleton<LoginUtilsWrapper>::get();
+  }
 
   LoginUtils* get() {
     AutoLock create(create_lock_);
     if (!ptr_.get())
       reset(new LoginUtilsImpl);
     return ptr_.get();
   }
 
   void reset(LoginUtils* ptr) {
     ptr_.reset(ptr);
   }
 
  private:
+  friend struct DefaultSingletonTraits<LoginUtilsWrapper>;
+
+  LoginUtilsWrapper() {}
+
   Lock create_lock_;
   scoped_ptr<LoginUtils> ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsWrapper);
 };
 
 void LoginUtilsImpl::CompleteLogin(
     const std::string& username,
     const std::string& password,
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
@@ skipping 277 matching lines @@
           GURL(GaiaAuthFetcher::kClientLoginUrl),
           chrome_browser_net::UrlInfo::EARLY_LOAD_MOTIVATED,
           kConnectionsNeeded);
     } else {
       new WarmingObserver();
     }
   }
 }
 
 LoginUtils* LoginUtils::Get() {
-  return Singleton<LoginUtilsWrapper>::get()->get();
+  return LoginUtilsWrapper::GetInstance()->get();
 }
 
 void LoginUtils::Set(LoginUtils* mock) {
-  Singleton<LoginUtilsWrapper>::get()->reset(mock);
+  LoginUtilsWrapper::GetInstance()->reset(mock);
 }
 
 void LoginUtils::DoBrowserLaunch(Profile* profile) {
   BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false);
   // Browser launch was disabled due to some post login screen.
   if (!LoginUtils::Get()->IsBrowserLaunchEnabled())
     return;
 
   // Update command line in case loose values were added.
   CommandLine::ForCurrentProcess()->InitFromArgv(
       CommandLine::ForCurrentProcess()->argv());
 
   VLOG(1) << "Launching browser...";
   BrowserInit browser_init;
   int return_code;
   browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                              profile,
                              FilePath(),
                              true,
                              &return_code);
 }
 
 }  // namespace chromeos