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

base/linux_util.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 "base/linux_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glib.h>
@@ skipping 20 matching lines @@
 enum LinuxDistroState {
   STATE_DID_NOT_CHECK  = 0,
   STATE_CHECK_STARTED  = 1,
   STATE_CHECK_FINISHED = 2,
 };
 
 // Helper class for GetLinuxDistro().
 class LinuxDistroHelper {
  public:
   // Retrieves the Singleton.
-  static LinuxDistroHelper* Get() {
+  static LinuxDistroHelper* GetInstance() {
     return Singleton<LinuxDistroHelper>::get();
   }
 
   // The simple state machine goes from:
   // STATE_DID_NOT_CHECK -> STATE_CHECK_STARTED -> STATE_CHECK_FINISHED.
   LinuxDistroHelper() : state_(STATE_DID_NOT_CHECK) {}
   ~LinuxDistroHelper() {}
 
   // Retrieve the current state, if we're in STATE_DID_NOT_CHECK,
   // we automatically move to STATE_CHECK_STARTED so nobody else will
@@ skipping 82 matching lines @@
 #if defined(OS_CHROMEOS)
     "CrOS";
 #else  // if defined(OS_LINUX)
     "Unknown";
 #endif
 
 std::string GetLinuxDistro() {
 #if defined(OS_CHROMEOS)
   return g_linux_distro;
 #elif defined(OS_LINUX)
-  LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::Get();
+  LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
   LinuxDistroState state = distro_state_singleton->State();
   if (STATE_DID_NOT_CHECK == state) {
     // We do this check only once per process. If it fails, there's
     // little reason to believe it will work if we attempt to run
     // lsb_release again.
     std::vector<std::string> argv;
     argv.push_back("lsb_release");
     argv.push_back("-d");
     std::string output;
     base::GetAppOutput(CommandLine(argv), &output);
@@ skipping 133 matching lines @@
 
     if (0 == strncmp(expected_data.c_str(), syscall_data.get(),
                      expected_data.length())) {
       return current_tid;
     }
   }
   return -1;
 }
 
 }  // namespace base