Move Singleton and related structs to namespace base

ui/events/ozone/chromeos/cursor_controller.h

 // Copyright 2014 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_EVENTS_OZONE_CHROMEOS_CURSOR_CONTROLLER_H_
 #define UI_EVENTS_OZONE_CHROMEOS_CURSOR_CONTROLLER_H_
 
 #include <map>
 
 #include "base/event_types.h"
@@ skipping 43 matching lines @@
   //      then we set (dx, dy) = (-6, 4)
   //
   // Since scale generally includes DSF, you can think of the input
   // vector unit as DIP and the output vector unit as pixels.
   void ApplyCursorConfigForWindow(gfx::AcceleratedWidget widget,
                                   gfx::Vector2dF* delta) const;
 
  private:
   CursorController();
   ~CursorController();
-  friend struct DefaultSingletonTraits<CursorController>;
+  friend struct base::DefaultSingletonTraits<CursorController>;
 
   struct PerWindowCursorConfiguration {
     gfx::Display::Rotation rotation;
     float scale;
   };
 
   typedef std::map<gfx::AcceleratedWidget, PerWindowCursorConfiguration>
       WindowToCursorConfigurationMap;
 
   WindowToCursorConfigurationMap window_to_cursor_configuration_map_;
   mutable base::Lock window_to_cursor_configuration_map_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorController);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_CHROMEOS_CURSOR_CONTROLLER_H_