Move Singleton and related structs to namespace base

chrome/browser/chromeos/mobile_config.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 CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
 #define CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 142 matching lines @@
  protected:
   bool LoadManifestFromString(const std::string& manifest) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, BadManifest);
   FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, DealOtherLocale);
   FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, OldDeal);
   FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfigNoDeals);
   FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, LocalConfig);
-  friend struct DefaultSingletonTraits<MobileConfig>;
+  friend struct base::DefaultSingletonTraits<MobileConfig>;
 
   // C-tor for singleton construction.
   MobileConfig();
 
   // C-tor for test construction.
   MobileConfig(const std::string& config,
                const std::string& initial_locale);
 
   ~MobileConfig() override;
 
@@ skipping 23 matching lines @@
   // Root value of the local config (if it exists).
   // Global config is stored in root_ of the base class.
   scoped_ptr<base::DictionaryValue> local_config_root_;
 
   DISALLOW_COPY_AND_ASSIGN(MobileConfig);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_MOBILE_CONFIG_H_