Move Singleton and related structs to namespace base

chrome/browser/chromeos/mobile_config.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 "chrome/browser/chromeos/mobile_config.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 195 matching lines @@
 
 void MobileConfig::LocaleConfig::InitFromDictionary(
     base::DictionaryValue* locale_dict) {
   locale_dict->GetString(kSetupURLAttr, &setup_url_);
 }
 
 // MobileConfig implementation, public -----------------------------------------
 
 // static
 MobileConfig* MobileConfig::GetInstance() {
-  return Singleton<MobileConfig,
-      DefaultSingletonTraits<MobileConfig> >::get();
+  return base::Singleton<MobileConfig,
+                         base::DefaultSingletonTraits<MobileConfig>>::get();
 }
 
 const MobileConfig::Carrier* MobileConfig::GetCarrier(
     const std::string& carrier_id) const {
   CarrierIdMap::const_iterator id_iter = carrier_id_map_.find(carrier_id);
   std::string internal_id;
   if (id_iter != carrier_id_map_.end())
     internal_id = id_iter->second;
   else
     return NULL;
@@ skipping 139 matching lines @@
             << local_config_file.value();
   }
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&MobileConfig::ProcessConfig,
                                      base::Unretained(this),  // singleton.
                                      global_config,
                                      local_config));
 }
 
 }  // namespace chromeos