Move Singleton and related structs to namespace base

chrome/browser/prefs/incognito_mode_prefs.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 "chrome/browser/prefs/incognito_mode_prefs.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 24 matching lines @@
 #if defined(OS_WIN)
 namespace {
 
 // This singleton allows us to attempt to calculate the Platform Parental
 // Controls enabled value on a worker thread before the UI thread needs the
 // value. If the UI thread finishes sooner than we expect, that's no worse than
 // today where we block.
 class PlatformParentalControlsValue {
  public:
   static PlatformParentalControlsValue* GetInstance() {
-    return Singleton<PlatformParentalControlsValue>::get();
+    return base::Singleton<PlatformParentalControlsValue>::get();
   }
 
   bool is_enabled() const {
     return is_enabled_;
   }
 
  private:
-  friend struct DefaultSingletonTraits<PlatformParentalControlsValue>;
+  friend struct base::DefaultSingletonTraits<PlatformParentalControlsValue>;
 
   // Histogram enum for tracking the thread that checked parental controls.
   enum class ThreadType {
     UI = 0,
     BLOCKING,
     COUNT,
   };
 
   PlatformParentalControlsValue()
       : is_enabled_(IsParentalControlActivityLoggingOn()) {}
@@ skipping 144 matching lines @@
 bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
 #if defined(OS_WIN)
   return PlatformParentalControlsValue::GetInstance()->is_enabled();
 #elif defined(OS_ANDROID)
   return chrome::android::ChromeApplication::AreParentalControlsEnabled();
 #else
   return false;
 #endif
 }