Move Singleton and related structs to namespace base

ash/touch/touch_uma.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 ASH_TOUCH_TOUCH_OBSERVER_UMA_H_
 #define ASH_TOUCH_TOUCH_OBSERVER_UMA_H_
 
 #include <map>
 
 #include "ash/shell.h"
@@ skipping 42 matching lines @@
   // Returns the singleton instance.
   static TouchUMA* GetInstance();
 
   void RecordGestureEvent(aura::Window* target,
                           const ui::GestureEvent& event);
   void RecordGestureAction(GestureActionType action);
   void RecordTouchEvent(aura::Window* target,
                         const ui::TouchEvent& event);
 
  private:
-  friend struct DefaultSingletonTraits<TouchUMA>;
+  friend struct base::DefaultSingletonTraits<TouchUMA>;
 
   TouchUMA();
   ~TouchUMA();
 
   void UpdateTouchState(const ui::TouchEvent& event);
   GestureActionType FindGestureActionType(aura::Window* window,
                                           const ui::GestureEvent& event);
 
   bool is_single_finger_gesture_;
   // These are used to measure the number of touch-start events we receive in a
   // quick succession, regardless of the target window.
   bool touch_in_progress_;
   int burst_length_;
   base::TimeDelta last_touch_down_time_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchUMA);
 };
 
 }  // namespace ash
 
 #endif  // ASH_TOUCH_TOUCH_OBSERVER_UMA_H_