Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

ui/gl/gpu_switching_manager.h

 // 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.
 
 #ifndef UI_GL_GPU_SWITCHING_MANAGER_H_
 #define UI_GL_GPU_SWITCHING_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/singleton.h"
@@ skipping 31 matching lines @@
   void RemoveObserver(GpuSwitchingObserver* observer);
 
   // Called when a GPU switch is noticed by the system. In the browser process
   // this is occurs as a result of a system observer. In the GPU process, this
   // occurs as a result of an IPC from the browser. The system observer is kept
   // in the browser process only so that any workarounds or blacklisting can
   // be applied there.
   void NotifyGpuSwitched();
 
  private:
-  friend struct DefaultSingletonTraits<GpuSwitchingManager>;
+  friend struct base::DefaultSingletonTraits<GpuSwitchingManager>;
 
   GpuSwitchingManager();
   virtual ~GpuSwitchingManager();
 
   gfx::GpuPreference gpu_switching_option_;
   bool gpu_switching_option_set_;
 
   bool supports_dual_gpus_;
   bool supports_dual_gpus_set_;
 
   size_t gpu_count_;
 
   struct PlatformSpecific;
 
   base::ObserverList<GpuSwitchingObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuSwitchingManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_GL_GPU_SWITCHING_MANAGER_H_