Move Singleton and related structs to namespace base

components/rlz/rlz_tracker.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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "components/rlz/rlz_tracker.h"
 
@@ skipping 132 matching lines @@
                                     brand.c_str(), referral_ascii.c_str(),
                                     lang_ascii.c_str(), false, true);
 }
 
 }  // namespace
 
 RLZTracker* RLZTracker::tracker_ = nullptr;
 
 // static
 RLZTracker* RLZTracker::GetInstance() {
-  return tracker_ ? tracker_ : Singleton<RLZTracker>::get();
+  return tracker_ ? tracker_ : base::Singleton<RLZTracker>::get();
 }
 
 RLZTracker::RLZTracker()
     : first_run_(false),
       send_ping_immediately_(false),
       is_google_default_search_(false),
       is_google_homepage_(false),
       is_google_in_startpages_(false),
       already_ran_(false),
       omnibox_used_(false),
@@ skipping 392 matching lines @@
   // This method is called during unit tests while the RLZTracker has not been
   // initialized, so check for the presence of a delegate and exit if there is
   // none registered.
   RLZTracker* tracker = GetInstance();
   if (tracker->delegate_)
     tracker->RecordFirstSearch(RLZTracker::ChromeAppList());
 }
 #endif
 
 }  // namespace rlz