Move Singleton and related structs to namespace base

content/browser/gpu/shader_disk_cache.cc

 // Copyright (c) 2013 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/gpu/shader_disk_cache.h"
 
 #include "base/threading/thread_checker.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/common/constants.h"
@@ skipping 398 matching lines @@
       default:
         NOTREACHED();  // Invalid state provided.
         op_type_ = TERMINATE;
         break;
     }
   }
 }
 
 // static
 ShaderCacheFactory* ShaderCacheFactory::GetInstance() {
-  return Singleton<ShaderCacheFactory,
-      LeakySingletonTraits<ShaderCacheFactory> >::get();
+  return base::Singleton<ShaderCacheFactory,
+                         base::LeakySingletonTraits<ShaderCacheFactory>>::get();
 }
 
 ShaderCacheFactory::ShaderCacheFactory() {
 }
 
 ShaderCacheFactory::~ShaderCacheFactory() {
 }
 
 void ShaderCacheFactory::SetCacheInfo(int32 client_id,
                                       const base::FilePath& path) {
@@ skipping 185 matching lines @@
     const net::CompletionCallback& callback) {
   if (entry_map_.empty()) {
     return net::OK;
   }
   cache_complete_callback_ = callback;
   return net::ERR_IO_PENDING;
 }
 
 }  // namespace content