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}

6 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc
index 4636196..1f28b36 100644
--- a/chrome/browser/sync/test/integration/sync_app_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_app_helper.cc
@@ -116,7 +116,7 @@ AppStateMap GetAppStates(Profile* profile) {
 }  // namespace
 
 SyncAppHelper* SyncAppHelper::GetInstance() {
-  SyncAppHelper* instance = Singleton<SyncAppHelper>::get();
+  SyncAppHelper* instance = base::Singleton<SyncAppHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
diff --git a/chrome/browser/sync/test/integration/sync_app_helper.h b/chrome/browser/sync/test/integration/sync_app_helper.h
index 05398a5..c3bac14 100644
--- a/chrome/browser/sync/test/integration/sync_app_helper.h
+++ b/chrome/browser/sync/test/integration/sync_app_helper.h
@@ -53,7 +53,7 @@ class SyncAppHelper {
   void FixNTPOrdinalCollisions(Profile* profile);
 
  private:
-  friend struct DefaultSingletonTraits<SyncAppHelper>;
+  friend struct base::DefaultSingletonTraits<SyncAppHelper>;
 
   SyncAppHelper();
   ~SyncAppHelper();
diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.cc b/chrome/browser/sync/test/integration/sync_app_list_helper.cc
index cf2dab9..94e7b59 100644
--- a/chrome/browser/sync/test/integration/sync_app_list_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_app_list_helper.cc
@@ -25,7 +25,7 @@ using app_list::AppListSyncableService;
 using app_list::AppListSyncableServiceFactory;
 
 SyncAppListHelper* SyncAppListHelper::GetInstance() {
-  SyncAppListHelper* instance = Singleton<SyncAppListHelper>::get();
+  SyncAppListHelper* instance = base::Singleton<SyncAppListHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.h b/chrome/browser/sync/test/integration/sync_app_list_helper.h
index 10112d2..9e4186a 100644
--- a/chrome/browser/sync/test/integration/sync_app_list_helper.h
+++ b/chrome/browser/sync/test/integration/sync_app_list_helper.h
@@ -51,7 +51,7 @@ class SyncAppListHelper {
   void PrintAppList(Profile* profile);
 
  private:
-  friend struct DefaultSingletonTraits<SyncAppListHelper>;
+  friend struct base::DefaultSingletonTraits<SyncAppListHelper>;
 
   SyncAppListHelper();
   ~SyncAppListHelper();
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index 5fd70c8..2b10e2d 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -52,7 +52,7 @@ bool SyncExtensionHelper::ExtensionState::Equals(
 
 // static
 SyncExtensionHelper* SyncExtensionHelper::GetInstance() {
-  SyncExtensionHelper* instance = Singleton<SyncExtensionHelper>::get();
+  SyncExtensionHelper* instance = base::Singleton<SyncExtensionHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h
index 378d8bf..99dfa08 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.h
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.h
@@ -101,7 +101,7 @@ class SyncExtensionHelper {
   typedef std::map<std::string, std::string> StringMap;
   typedef std::map<std::string, extensions::Manifest::Type> TypeMap;
 
-  friend struct DefaultSingletonTraits<SyncExtensionHelper>;
+  friend struct base::DefaultSingletonTraits<SyncExtensionHelper>;
 
   SyncExtensionHelper();
   ~SyncExtensionHelper();