Move Singleton and related structs to namespace base

Public APIs from base should live inside base:: so moved Singleton class
and structs to base{} and fixed consumers.

also fixed:

** Presubmit ERRORS **
Found Singleton<T> in the following header files.
Please move them to an appropriate source file so that the template
gets instantiated in a single compilation unit.
  chrome/browser/plugins/plugin_finder.h \
  chromecast/media/base/media_message_loop.h \
  content/browser/media/android/media_drm_credential_manager.h

Presubmit warnings:
src/chrome/browser/extensions/warning_badge_service_factory.h:5:
  #ifndef header guard has wrong style, please use:
  CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_
  [build/header_guard] [5]
src/chrome/browser/extensions/warning_badge_service_factory.h:39:
  #endif line should be "#endif  //
  CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_"
  [build/header_guard] [5]

TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1308823002

Cr-Commit-Position: refs/heads/master@{#348136}

2 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc
index 9f1a7f6..ce8d4f2 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc
@@ -16,7 +16,7 @@ BitmapFetcherService* BitmapFetcherServiceFactory::GetForBrowserContext(
 
 // static
 BitmapFetcherServiceFactory* BitmapFetcherServiceFactory::GetInstance() {
-  return Singleton<BitmapFetcherServiceFactory>::get();
+  return base::Singleton<BitmapFetcherServiceFactory>::get();
 }
 
 BitmapFetcherServiceFactory::BitmapFetcherServiceFactory()
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h
index 52662a5..a83f716 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h
@@ -18,7 +18,7 @@ class BitmapFetcherServiceFactory : BrowserContextKeyedServiceFactory {
   static BitmapFetcherServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<BitmapFetcherServiceFactory>;
+  friend struct base::DefaultSingletonTraits<BitmapFetcherServiceFactory>;
 
   BitmapFetcherServiceFactory();
   ~BitmapFetcherServiceFactory() override;