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}

4 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc
index 2e7eb77..54ed7ee 100644
--- a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc
+++ b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc
@@ -21,7 +21,7 @@ GObjectDestructorFILO::~GObjectDestructorFILO() {
 
 // static
 GObjectDestructorFILO* GObjectDestructorFILO::GetInstance() {
-  return Singleton<GObjectDestructorFILO>::get();
+  return base::Singleton<GObjectDestructorFILO>::get();
 }
 
 void GObjectDestructorFILO::Connect(
diff --git a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h
index d51de50..b32f3df 100644
--- a/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h
+++ b/chrome/browser/ui/libgtk2ui/g_object_destructor_filo.h
@@ -11,7 +11,9 @@
 
 #include "base/basictypes.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}
 
 typedef struct _GObject GObject;
 
@@ -72,7 +74,7 @@ class GObjectDestructorFILO {
 
   GObjectDestructorFILO();
   ~GObjectDestructorFILO();
-  friend struct DefaultSingletonTraits<GObjectDestructorFILO>;
+  friend struct base::DefaultSingletonTraits<GObjectDestructorFILO>;
 
   void WeakNotify(GObject* where_the_object_was);
   static void WeakNotifyThunk(gpointer data, GObject* where_the_object_was) {
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc
index e48c186..b77de95 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc
@@ -16,7 +16,7 @@ namespace libgtk2ui {
 
 // static
 Gtk2EventLoop* Gtk2EventLoop::GetInstance() {
-  return Singleton<Gtk2EventLoop>::get();
+  return base::Singleton<Gtk2EventLoop>::get();
 }
 
 Gtk2EventLoop::Gtk2EventLoop() {
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h
index 0bd2a21..5ba99d5 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_event_loop.h
@@ -11,7 +11,9 @@
 typedef union _GdkEvent GdkEvent;
 typedef struct _GdkEventKey GdkEventKey;
 
+namespace base {
 template<typename Type> struct DefaultSingletonTraits;
+}
 
 namespace libgtk2ui {
 
@@ -20,7 +22,7 @@ class Gtk2EventLoop {
   static Gtk2EventLoop* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<Gtk2EventLoop>;
+  friend struct base::DefaultSingletonTraits<Gtk2EventLoop>;
 
   Gtk2EventLoop();
   ~Gtk2EventLoop();