Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

ui/gl/gpu_switching_manager.cc

 // Copyright (c) 2012 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/gl/gpu_switching_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "ui/gl/gl_switches.h"
 
 namespace ui {
 
 // static
 GpuSwitchingManager* GpuSwitchingManager::GetInstance() {
-  return Singleton<GpuSwitchingManager>::get();
+  return base::Singleton<GpuSwitchingManager>::get();
 }
 
 GpuSwitchingManager::GpuSwitchingManager()
     : gpu_switching_option_(gfx::PreferIntegratedGpu),
       gpu_switching_option_set_(false),
       supports_dual_gpus_(false),
       supports_dual_gpus_set_(false),
       gpu_count_(0) {
 }
 
@@ skipping 60 matching lines @@
 }
 
 gfx::GpuPreference GpuSwitchingManager::AdjustGpuPreference(
     gfx::GpuPreference gpu_preference) {
   if (!gpu_switching_option_set_)
     return gpu_preference;
   return gpu_switching_option_;
 }
 
 }  // namespace ui