Move Singleton and related structs to namespace base

content/browser/accessibility/browser_accessibility_state_impl.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_state_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "content/browser/accessibility/accessibility_mode_helper.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gfx/color_utils.h"
 
 namespace content {
 
 // Update the accessibility histogram 45 seconds after initialization.
 static const int kAccessibilityHistogramDelaySecs = 45;
 
 // static
 BrowserAccessibilityState* BrowserAccessibilityState::GetInstance() {
   return BrowserAccessibilityStateImpl::GetInstance();
 }
 
 // static
 BrowserAccessibilityStateImpl* BrowserAccessibilityStateImpl::GetInstance() {
-  return Singleton<BrowserAccessibilityStateImpl,
-                   LeakySingletonTraits<BrowserAccessibilityStateImpl> >::get();
+  return base::Singleton<
+      BrowserAccessibilityStateImpl,
+      base::LeakySingletonTraits<BrowserAccessibilityStateImpl>>::get();
 }
 
 BrowserAccessibilityStateImpl::BrowserAccessibilityStateImpl()
     : BrowserAccessibilityState(),
       accessibility_mode_(AccessibilityModeOff),
       disable_hot_tracking_(false) {
   ResetAccessibilityModeValue();
 #if defined(OS_WIN)
   // On Windows, UpdateHistograms calls some system functions with unknown
   // runtime, so call it on the file thread to ensure there's no jank.
@@ skipping 117 matching lines @@
       WebContentsImpl::GetAllWebContents();
   for (size_t i = 0; i < web_contents_vector.size(); ++i) {
     if (add)
       web_contents_vector[i]->AddAccessibilityMode(mode);
     else
       web_contents_vector[i]->RemoveAccessibilityMode(mode);
   }
 }
 
 }  // namespace content