Move Singleton and related structs to namespace base

chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc

 // Copyright 2013 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/ui/toolbar/toolbar_actions_model_factory.h"
 
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/extensions_browser_client.h"
 
 // static
 ToolbarActionsModel* ToolbarActionsModelFactory::GetForProfile(
     Profile* profile) {
   return static_cast<ToolbarActionsModel*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 ToolbarActionsModelFactory* ToolbarActionsModelFactory::GetInstance() {
-  return Singleton<ToolbarActionsModelFactory>::get();
+  return base::Singleton<ToolbarActionsModelFactory>::get();
 }
 
 ToolbarActionsModelFactory::ToolbarActionsModelFactory()
     : BrowserContextKeyedServiceFactory(
           "ToolbarActionsModel",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
   DependsOn(extensions::ExtensionActionAPI::GetFactoryInstance());
 }
 
@@ skipping 11 matching lines @@
   return context;
 }
 
 bool ToolbarActionsModelFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 bool ToolbarActionsModelFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }