Move Singleton and related structs to namespace base

chrome/browser/bookmarks/chrome_bookmark_client_factory.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/bookmarks/chrome_bookmark_client_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 14 matching lines @@
 
 // static
 ChromeBookmarkClient* ChromeBookmarkClientFactory::GetForProfile(
     Profile* profile) {
   return static_cast<ChromeBookmarkClient*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 ChromeBookmarkClientFactory* ChromeBookmarkClientFactory::GetInstance() {
-  return Singleton<ChromeBookmarkClientFactory>::get();
+  return base::Singleton<ChromeBookmarkClientFactory>::get();
 }
 
 // static
 BrowserContextKeyedServiceFactory::TestingFactoryFunction
 ChromeBookmarkClientFactory::GetDefaultFactory() {
   return &BuildChromeBookmarkClient;
 }
 
 ChromeBookmarkClientFactory::ChromeBookmarkClientFactory()
     : BrowserContextKeyedServiceFactory(
@@ skipping 11 matching lines @@
 }
 
 content::BrowserContext* ChromeBookmarkClientFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool ChromeBookmarkClientFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }