Move Singleton and related structs to namespace base

ui/gfx/android/shared_device_display_info.cc

 // 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.
 
 #include "ui/gfx/android/shared_device_display_info.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "jni/DeviceDisplayInfo_jni.h"
@@ skipping 14 matching lines @@
                                           jint rotation_degrees) {
   SharedDeviceDisplayInfo::GetInstance()->InvokeUpdate(env, obj,
       display_height, display_width,
       physical_display_height, physical_display_width,
       bits_per_pixel, bits_per_component,
       dip_scale, smallest_dip_width, rotation_degrees);
 }
 
 // static
 SharedDeviceDisplayInfo* SharedDeviceDisplayInfo::GetInstance() {
-  return Singleton<SharedDeviceDisplayInfo>::get();
+  return base::Singleton<SharedDeviceDisplayInfo>::get();
 }
 
 int SharedDeviceDisplayInfo::GetDisplayHeight() {
   base::AutoLock autolock(lock_);
   DCHECK_NE(0, display_height_);
   return display_height_;
 }
 
 int SharedDeviceDisplayInfo::GetDisplayWidth() {
   base::AutoLock autolock(lock_);
@@ skipping 108 matching lines @@
   physical_display_height_ = static_cast<int>(physical_display_height);
   physical_display_width_ = static_cast<int>(physical_display_width);
   bits_per_pixel_ = static_cast<int>(bits_per_pixel);
   bits_per_component_ = static_cast<int>(bits_per_component);
   dip_scale_ = static_cast<double>(dip_scale);
   smallest_dip_width_ = static_cast<int>(smallest_dip_width);
   rotation_degrees_ = static_cast<int>(rotation_degrees);
 }
 
 }  // namespace gfx