Move Singleton and related structs to namespace base

components/rlz/rlz_tracker.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 COMPONENTS_RLZ_RLZ_TRACKER_H_
 #define COMPONENTS_RLZ_RLZ_TRACKER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 105 matching lines @@
   // Used by test code to override the default RLZTracker instance returned
   // by GetInstance().
   void set_tracker(RLZTracker* tracker) { tracker_ = tracker; }
 
   // Sends the financial ping to the RLZ servers and invalidates the RLZ string
   // cache since the response from the RLZ server may have changed then.
   // Protected so that its accessible from tests.
   void PingNowImpl();
 
  private:
-  friend struct DefaultSingletonTraits<RLZTracker>;
+  friend struct base::DefaultSingletonTraits<RLZTracker>;
   friend class base::RefCountedThreadSafe<RLZTracker>;
 
   // Implementation called from SetRlzDelegate() static method.
   void SetDelegate(scoped_ptr<RLZTrackerDelegate> delegate);
 
   // Implementation called from InitRlzDelayed() static method.
   bool Init(bool first_run,
             bool send_ping_immediately,
             base::TimeDelta delay,
             bool is_google_default_search,
@@ skipping 96 matching lines @@
 
   // Minimum delay before sending financial ping after initialization.
   base::TimeDelta min_init_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(RLZTracker);
 };
 
 }  // namespace rlz
 
 #endif  // COMPONENTS_RLZ_RLZ_TRACKER_H_