Move Singleton and related structs to namespace base

chrome/browser/service_process/service_process_control.h

 // 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.
 
 #ifndef CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_
 #define CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_
 
 #include <queue>
 #include <set>
 #include <string>
@@ skipping 158 matching lines @@
     uint32 retry_count_;
     base::Process process_;
   };
 
   friend class MockServiceProcessControl;
   friend class CloudPrintProxyPolicyStartupTest;
 
   ServiceProcessControl();
   ~ServiceProcessControl() override;
 
-  friend struct DefaultSingletonTraits<ServiceProcessControl>;
+  friend struct base::DefaultSingletonTraits<ServiceProcessControl>;
 
   typedef std::vector<base::Closure> TaskList;
 
   // Message handlers
   void OnCloudPrintProxyInfo(
       const cloud_print::CloudPrintProxyInfo& proxy_info);
   void OnHistograms(const std::vector<std::string>& pickled_histograms);
   void OnPrinters(const std::vector<std::string>& printers);
 
   // Runs callback provided in |GetHistograms()|.
@@ skipping 36 matching lines @@
   // the service process.
   base::Closure histograms_callback_;
 
   content::NotificationRegistrar registrar_;
 
   // Callback that gets invoked if service didn't reply in time.
   base::CancelableClosure histograms_timeout_callback_;
 };
 
 #endif  // CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_