Move Singleton and related structs to namespace base

chrome/browser/bookmarks/bookmark_model_factory.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/bookmarks/bookmark_model_factory.h"
 
 #include "base/command_line.h"
 #include "base/deferred_sequenced_task_runner.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
@@ skipping 28 matching lines @@
 }
 
 // static
 BookmarkModel* BookmarkModelFactory::GetForProfileIfExists(Profile* profile) {
   return static_cast<BookmarkModel*>(
       GetInstance()->GetServiceForBrowserContext(profile, false));
 }
 
 // static
 BookmarkModelFactory* BookmarkModelFactory::GetInstance() {
-  return Singleton<BookmarkModelFactory>::get();
+  return base::Singleton<BookmarkModelFactory>::get();
 }
 
 BookmarkModelFactory::BookmarkModelFactory()
     : BrowserContextKeyedServiceFactory(
         "BookmarkModel",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(BookmarkUndoServiceFactory::GetInstance());
   DependsOn(ChromeBookmarkClientFactory::GetInstance());
   DependsOn(StartupTaskRunnerServiceFactory::GetInstance());
 #if defined(OS_ANDROID)
@@ skipping 44 matching lines @@
 }
 
 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }