Move Singleton and related structs to namespace base

chrome/browser/extensions/api/automation_internal/automation_event_router.cc

 // Copyright 2015 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/extensions/api/automation_internal/automation_event_router.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/automation_internal.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/event_router.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node_data.h"
 
 namespace extensions {
 
 // static
 AutomationEventRouter* AutomationEventRouter::GetInstance() {
-  return Singleton<AutomationEventRouter,
-                   LeakySingletonTraits<AutomationEventRouter>>::get();
+  return base::Singleton<
+      AutomationEventRouter,
+      base::LeakySingletonTraits<AutomationEventRouter>>::get();
 }
 
 AutomationEventRouter::AutomationEventRouter() {
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                  content::NotificationService::AllBrowserContextsAndSources());
 }
 
 AutomationEventRouter::~AutomationEventRouter() {
@@ skipping 95 matching lines @@
       std::remove_if(
           listeners_.begin(),
           listeners_.end(),
           [process_id](const AutomationListener& item) {
             return item.process_id == process_id;
           }),
       listeners_.end());
 }
 
 }  // namespace extensions