Move Singleton and related structs to namespace base

components/web_cache/browser/web_cache_manager.h

 // Copyright (c) 2011 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.
 
 // This is the browser side of the cache manager, it tracks the activity of the
 // render processes and allocates available memory cache resources.
 
 #ifndef COMPONENTS_WEB_CACHE_BROWSER_WEB_CACHE_MANAGER_H_
 #define COMPONENTS_WEB_CACHE_BROWSER_WEB_CACHE_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 
+namespace base {
 template<typename Type>
 struct DefaultSingletonTraits;
+}  // namespace base
+
 class PrefRegistrySimple;
 
 namespace web_cache {
 
 class WebCacheManager : public content::NotificationObserver {
   friend class WebCacheManagerTest;
   FRIEND_TEST_ALL_PREFIXES(
       WebCacheManagerTest,
       CallRemoveRendererAndObserveActivityInAnyOrderShouldNotCrashTest_1);
   FRIEND_TEST_ALL_PREFIXES(
@@ skipping 81 matching lines @@
   // An allocation is the number of bytes a specific renderer should use for
   // its cache.
   typedef std::pair<int,size_t> Allocation;
 
   // An allocation strategy is a list of allocations specifying the resources
   // each renderer is permitted to consume for its cache.
   typedef std::list<Allocation> AllocationStrategy;
 
   // This class is a singleton.  Do not instantiate directly.
   WebCacheManager();
-  friend struct DefaultSingletonTraits<WebCacheManager>;
+  friend struct base::DefaultSingletonTraits<WebCacheManager>;
 
   ~WebCacheManager() override;
 
   // Recomputes the allocation of cache resources among the renderers.  Also
   // informs the renderers of their new allocation.
   void ReviseAllocationStrategy();
 
   // Schedules a call to ReviseAllocationStrategy after a short delay.
   void ReviseAllocationStrategyLater();
 
@@ skipping 97 matching lines @@
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<WebCacheManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebCacheManager);
 };
 
 }  // namespace web_cache
 
 #endif  // COMPONENTS_WEB_CACHE_BROWSER_WEB_CACHE_MANAGER_H_