Move Singleton and related structs to namespace base

chrome/browser/media_galleries/gallery_watch_manager.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/media_galleries/gallery_watch_manager.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 12 matching lines @@
 
 namespace {
 
 // Don't send a notification more than once per 3 seconds (chosen arbitrarily).
 const int kMinNotificiationDelayInSeconds = 3;
 
 class ShutdownNotifierFactory
     : public BrowserContextKeyedServiceShutdownNotifierFactory {
  public:
   static ShutdownNotifierFactory* GetInstance() {
-    return Singleton<ShutdownNotifierFactory>::get();
+    return base::Singleton<ShutdownNotifierFactory>::get();
   }
 
  private:
-  friend struct DefaultSingletonTraits<ShutdownNotifierFactory>;
+  friend struct base::DefaultSingletonTraits<ShutdownNotifierFactory>;
 
   ShutdownNotifierFactory()
       : BrowserContextKeyedServiceShutdownNotifierFactory(
             "GalleryWatchManager") {
     DependsOn(MediaGalleriesPreferencesFactory::GetInstance());
   }
   ~ShutdownNotifierFactory() override {}
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownNotifierFactory);
 };
@@ skipping 438 matching lines @@
       DeactivateFileWatch(owner, it->second);
       // Post increment moves iterator to next element while deleting current.
       watches_.erase(it++);
       observers_[preferences->profile()]->OnGalleryWatchDropped(
           owner.extension_id, owner.gallery_id);
     } else {
       ++it;
     }
   }
 }