Move Singleton and related structs to namespace base

content/browser/accessibility/accessibility_tree_formatter_utils_win.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/accessibility_tree_formatter_utils_win.h"
 
 #include <oleacc.h>
 
 #include <map>
 #include <string>
@@ skipping 13 matching lines @@
   std::map<int32, base::string16> ia_role_string_map;
   std::map<int32, base::string16> ia2_role_string_map;
   std::map<int32, base::string16> ia_state_string_map;
   std::map<int32, base::string16> ia2_state_string_map;
   std::map<int32, base::string16> event_string_map;
 
  private:
   AccessibilityEnumMap();
   virtual ~AccessibilityEnumMap() {}
 
-  friend struct DefaultSingletonTraits<AccessibilityEnumMap>;
+  friend struct base::DefaultSingletonTraits<AccessibilityEnumMap>;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityEnumMap);
 };
 
 // static
 AccessibilityEnumMap* AccessibilityEnumMap::GetInstance() {
-  return Singleton<AccessibilityEnumMap,
-                   LeakySingletonTraits<AccessibilityEnumMap> >::get();
+  return base::Singleton<
+      AccessibilityEnumMap,
+      base::LeakySingletonTraits<AccessibilityEnumMap>>::get();
 }
 
 AccessibilityEnumMap::AccessibilityEnumMap() {
 // Convenience macros for generating readable strings.
 #define IA_ROLE_MAP(x) ia_role_string_map[x] = L###x;  \
                        ia2_role_string_map[x] = L###x;
 #define IA2_ROLE_MAP(x) ia2_role_string_map[x] = L###x;
 #define IA_STATE_MAP(x) ia_state_string_map[STATE_SYSTEM_##x] = L###x;
 #define IA2_STATE_MAP(x) ia2_state_string_map[x] = L###x;
 #define EVENT_MAP(x) event_string_map[x] = L###x;
@@ skipping 280 matching lines @@
   std::vector<base::string16> strings;
   IAccessible2StateToStringVector(ia2_state, &strings);
   return base::JoinString(strings, base::ASCIIToUTF16(","));
 }
 
 base::string16 AccessibilityEventToString(int32 event_id) {
   return AccessibilityEnumMap::GetInstance()->event_string_map[event_id];
 }
 
 }  // namespace content