Move Singleton and related structs to namespace base

chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc

 // Copyright 2014 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/app_mode/kiosk_diagnosis_runner.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 10 matching lines @@
 
 namespace chromeos {
 
 class KioskDiagnosisRunner::Factory : public BrowserContextKeyedServiceFactory {
  public:
   static KioskDiagnosisRunner* GetForProfile(Profile* profile) {
     return static_cast<KioskDiagnosisRunner*>(
         GetInstance()->GetServiceForBrowserContext(profile, true));
   }
 
-  static Factory* GetInstance() {
-    return Singleton<Factory>::get();
-  }
+  static Factory* GetInstance() { return base::Singleton<Factory>::get(); }
 
  private:
-  friend struct DefaultSingletonTraits<Factory>;
+  friend struct base::DefaultSingletonTraits<Factory>;
 
   Factory()
       : BrowserContextKeyedServiceFactory(
             "KioskDiagnosisRunner",
             BrowserContextDependencyManager::GetInstance()) {
     DependsOn(extensions::ExtensionsBrowserClient::Get()
                   ->GetExtensionSystemFactory());
     DependsOn(extensions::FeedbackPrivateAPI::GetFactoryInstance());
   }
 
@@ skipping 73 matching lines @@
                         feedback_data,
                         base::Bind(&KioskDiagnosisRunner::OnFeedbackSent,
                                    weak_factory_.GetWeakPtr()));
 }
 
 void KioskDiagnosisRunner::OnFeedbackSent(bool) {
   // Do nothing.
 }
 
 }  // namespace chromeos