Move Singleton and related structs to namespace base

chrome/browser/apps/app_shim/app_shim_handler_mac.cc

 // Copyright 2013 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/apps/app_shim/app_shim_handler_mac.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
   if (!app_windows_left &&
       !AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)
            ->IsAppListVisible()) {
     chrome::AttemptExit();
   }
 }
 
 class AppShimHandlerRegistry : public content::NotificationObserver {
  public:
   static AppShimHandlerRegistry* GetInstance() {
-    return Singleton<AppShimHandlerRegistry,
-                     LeakySingletonTraits<AppShimHandlerRegistry> >::get();
+    return base::Singleton<
+        AppShimHandlerRegistry,
+        base::LeakySingletonTraits<AppShimHandlerRegistry>>::get();
   }
 
   AppShimHandler* GetForAppMode(const std::string& app_mode_id) const {
     HandlerMap::const_iterator it = handlers_.find(app_mode_id);
     if (it != handlers_.end())
       return it->second;
 
     return default_handler_;
   }
 
@@ skipping 17 matching lines @@
       base::MessageLoop::current()->PostTask(
           FROM_HERE, base::Bind(&TerminateIfNoAppWindows));
     }
   }
 
   bool ShouldRestoreSession() {
     return !browser_session_running_;
   }
 
  private:
-  friend struct DefaultSingletonTraits<AppShimHandlerRegistry>;
+  friend struct base::DefaultSingletonTraits<AppShimHandlerRegistry>;
   typedef std::map<std::string, AppShimHandler*> HandlerMap;
 
   AppShimHandlerRegistry()
       : default_handler_(NULL),
         browser_session_running_(false) {
     registrar_.Add(
         this, chrome::NOTIFICATION_BROWSER_OPENED,
         content::NotificationService::AllBrowserContextsAndSources());
     registrar_.Add(
         this, chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
@@ skipping 58 matching lines @@
 void AppShimHandler::MaybeTerminate() {
   AppShimHandlerRegistry::GetInstance()->MaybeTerminate();
 }
 
 // static
 bool AppShimHandler::ShouldRestoreSession() {
   return AppShimHandlerRegistry::GetInstance()->ShouldRestoreSession();
 }
 
 }  // namespace apps