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

chrome/browser/chromeos/boot_times_loader.cc

 // Copyright (c) 2009 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/boot_times_loader.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
-#include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/thread.h"
 #include "base/thread_restrictions.h"
 #include "base/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 29 matching lines @@
 static const char kUmaLoginPrefix[] = "BootTime.";
 static const char kUmaLogout[] = "ShutdownTime.Logout";
 static const char kUmaLogoutPrefix[] = "ShutdownTime.";
 
 // Name of file collecting login times.
 static const FilePath::CharType kLoginTimes[] = FPL("login-times-sent");
 
 // Name of file collecting logout times.
 static const char kLogoutTimes[] = "logout-times-sent";
 
+static base::LazyInstance<BootTimesLoader> g_boot_times_loader(
+    base::LINKER_INITIALIZED);
+
 BootTimesLoader::BootTimesLoader()
     : backend_(new Backend()),
       have_registered_(false) {
   login_time_markers_.reserve(30);
   logout_time_markers_.reserve(30);
 }
 
 // static
 BootTimesLoader* BootTimesLoader::Get() {
-  return Singleton<BootTimesLoader>::get();
+  return g_boot_times_loader.Pointer();
 }
 
 BootTimesLoader::Handle BootTimesLoader::GetBootTimes(
     CancelableRequestConsumerBase* consumer,
     BootTimesLoader::GetBootTimesCallback* callback) {
   if (!g_browser_process->file_thread()) {
     // This should only happen if Chrome is shutting down, so we don't do
     // anything.
     return 0;
   }
@@ skipping 281 matching lines @@
       registrar_.Remove(this, NotificationType::LOGIN_AUTHENTICATION,
                         NotificationService::AllSources());
     }
   } else if (type == NotificationType::LOAD_START) {
     // Make sure it's not some page load initiated by OOBE/login screen.
     if (!UserManager::Get()->user_is_logged_in())
       return;
     // Only log for first tab to render.  Make sure this is only done once.
     // If the network isn't connected we'll get a second LOAD_START once it is
     // and the page is reloaded.
-    if (NetworkStateNotifier::Get()->is_connected()) {
+    if (NetworkStateNotifier::GetInstance()->is_connected()) {
       // Post difference between first tab and login success time.
       AddLoginTimeMarker("LoginDone", true);
       RecordCurrentStats(kChromeFirstRender);
       // Post chrome first render stat.
       registrar_.Remove(this, NotificationType::LOAD_START,
                         NotificationService::AllSources());
       // Don't swamp the FILE thread right away.
       BrowserThread::PostDelayedTask(
           BrowserThread::FILE, FROM_HERE,
           // This doesn't compile without std::string(...), as
           // NewRunnableFunction doesn't accept arrays.
           NewRunnableFunction(WriteTimes,
                               std::string(kLoginTimes),
                               std::string(kUmaLogin),
                               std::string(kUmaLoginPrefix),
                               login_time_markers_),
           kLoginTimeWriteDelayMs);
       have_registered_ = false;
     } else {
       AddLoginTimeMarker("LoginRenderNoNetwork", false);
     }
   }
 }
 
 }  // namespace chromeos