Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

ui/events/devices/x11/touch_factory_x11.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_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 #define UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 
 #include <bitset>
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ui/events/devices/events_devices_export.h"
 #include "ui/gfx/sequential_id_generator.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}  // namespace base
 
 typedef unsigned long Cursor;
 typedef unsigned long Window;
 typedef struct _XDisplay Display;
 typedef union _XEvent XEvent;
 
 namespace ui {
 
 // Functions related to determining touch devices.
 class EVENTS_DEVICES_EXPORT TouchFactory {
@@ skipping 60 matching lines @@
   // devices and enables touch events processing. This function is only
   // for test purpose, and it does not query from X server.
   void SetTouchDeviceForTest(const std::vector<int>& devices);
 
   // Sets up the device id in the list |devices| as pointer devices.
   // This function is only for test purpose, and it does not query from
   // X server.
   void SetPointerDeviceForTest(const std::vector<int>& devices);
 
  private:
-  // Requirement for Singleton
-  friend struct DefaultSingletonTraits<TouchFactory>;
+  // Requirement for base::Singleton
+  friend struct base::DefaultSingletonTraits<TouchFactory>;
 
   void CacheTouchscreenIds(int id);
 
   // NOTE: To keep track of touch devices, we currently maintain a lookup table
   // to quickly decide if a device is a touch device or not. We also maintain a
   // list of the touch devices. Ideally, there will be only one touch device,
   // and instead of having the lookup table and the list, there will be a single
   // identifier for the touch device. This can be completed after enough testing
   // on real touch devices.
 
@@ skipping 26 matching lines @@
 
   // Associate each device ID with its master device ID.
   std::map<int, int> device_master_id_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_