Move Singleton and related structs to namespace base

ui/events/x/events_x.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/events/event_constants.h"
 
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/XKBlib.h>
@@ skipping 23 matching lines @@
 
 const int kMinWheelButton = 4;
 const int kMaxWheelButton = 7;
 
 // A class to track current modifier state on master device. Only track ctrl,
 // alt, shift and caps lock keys currently. The tracked state can then be used
 // by floating device.
 class XModifierStateWatcher{
  public:
   static XModifierStateWatcher* GetInstance() {
-    return Singleton<XModifierStateWatcher>::get();
+    return base::Singleton<XModifierStateWatcher>::get();
   }
 
   int StateFromKeyboardCode(ui::KeyboardCode keyboard_code) {
     switch (keyboard_code) {
       case ui::VKEY_CONTROL:
         return ControlMask;
       case ui::VKEY_SHIFT:
         return ShiftMask;
       case ui::VKEY_MENU:
         return Mod1Mask;
@@ skipping 38 matching lines @@
         NOTREACHED();
         break;
     }
   }
 
   // Returns the current modifer state in master device. It only contains the
   // state of ctrl, shift, alt and caps lock keys.
   unsigned int state() { return state_; }
 
  private:
-  friend struct DefaultSingletonTraits<XModifierStateWatcher>;
+  friend struct base::DefaultSingletonTraits<XModifierStateWatcher>;
 
   XModifierStateWatcher() : state_(0) { }
 
   unsigned int state_;
 
   DISALLOW_COPY_AND_ASSIGN(XModifierStateWatcher);
 };
 
 // Detects if a touch event is a driver-generated 'special event'.
 // A 'special event' is a touch event with maximum radius and pressure at
@@ skipping 794 matching lines @@
       xievent->detail =
           UpdateX11EventButton(event->changed_button_flags(), xievent->detail);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace ui