Move Singleton and related structs to namespace base

chrome/browser/service_process/service_process_control.cc

 // Copyright (c) 2012 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/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 299 matching lines @@
 
 bool ServiceProcessControl::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool ret = Send(new ServiceMsg_Shutdown());
   channel_.reset();
   return ret;
 }
 
 // static
 ServiceProcessControl* ServiceProcessControl::GetInstance() {
-  return Singleton<ServiceProcessControl>::get();
+  return base::Singleton<ServiceProcessControl>::get();
 }
 
 ServiceProcessControl::Launcher::Launcher(
     scoped_ptr<base::CommandLine> cmd_line)
     : cmd_line_(cmd_line.Pass()),
       launched_(false),
       retry_count_(0) {
 }
 
 // Execute the command line to start the process asynchronously.
@@ skipping 51 matching lines @@
   if (process_.IsValid()) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&Launcher::DoDetectLaunched, this));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, base::Bind(&Launcher::Notify, this));
   }
 }
 #endif  // !OS_MACOSX