Move Singleton and related structs to namespace base

ui/gfx/android/shared_device_display_info.h

 // Copyright 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 UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_
 #define UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
@@ skipping 26 matching lines @@
                     jint display_height,
                     jint display_width,
                     jint physical_display_height,
                     jint physical_display_width,
                     jint bits_per_pixel,
                     jint bits_per_component,
                     jdouble dip_scale,
                     jint smallest_dip_width,
                     jint rotation_degrees);
  private:
-  friend struct DefaultSingletonTraits<SharedDeviceDisplayInfo>;
+  friend struct base::DefaultSingletonTraits<SharedDeviceDisplayInfo>;
 
   SharedDeviceDisplayInfo();
   ~SharedDeviceDisplayInfo();
   void UpdateDisplayInfo(JNIEnv* env,
                          jobject jobj,
                          jint display_height,
                          jint display_width,
                          jint physical_display_height,
                          jint physical_display_width,
                          jint bits_per_pixel,
@@ skipping 14 matching lines @@
   double dip_scale_;
   int smallest_dip_width_;
   int rotation_degrees_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedDeviceDisplayInfo);
 };
 
 }  // namespace gfx
 
 #endif // UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_