Move Singleton and related structs to namespace base

content/browser/gpu/gpu_data_manager_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 167 matching lines @@
   bool UpdateActiveGpu(uint32 vendor_id, uint32 device_id);
 
   // Called when GPU process initialization failed.
   void OnGpuProcessInitFailure();
 
   bool IsDriverBugWorkaroundActive(int feature) const;
 
  private:
   friend class GpuDataManagerImplPrivate;
   friend class GpuDataManagerImplPrivateTest;
-  friend struct DefaultSingletonTraits<GpuDataManagerImpl>;
+  friend struct base::DefaultSingletonTraits<GpuDataManagerImpl>;
 
   // It's similar to AutoUnlock, but we want to make it a no-op
   // if the owner GpuDataManagerImpl is null.
   // This should only be used by GpuDataManagerImplPrivate where
   // callbacks are called, during which re-entering
   // GpuDataManagerImpl is possible.
   class UnlockedSession {
    public:
     explicit UnlockedSession(GpuDataManagerImpl* owner)
         : owner_(owner) {
@@ skipping 17 matching lines @@
 
   mutable base::Lock lock_;
   scoped_ptr<GpuDataManagerImplPrivate> private_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_