Move Singleton and related structs to namespace base

chrome/browser/chromeos/mobile/mobile_activator.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_MOBILE_ACTIVATOR_H_
 #define CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_
 
 #include <map>
 #include <string>
 
@@ skipping 137 matching lines @@
 
  protected:
   // For unit tests.
   void set_state_for_test(PlanActivationState state) {
     state_ = state;
   }
   virtual const NetworkState* GetNetworkState(const std::string& service_path);
   virtual const NetworkState* GetDefaultNetwork();
 
  private:
-  friend struct DefaultSingletonTraits<MobileActivator>;
+  friend struct base::DefaultSingletonTraits<MobileActivator>;
   friend class TestMobileActivator;
   friend class MobileActivatorTest;
 
   MobileActivator();
   ~MobileActivator() override;
 
   // NetworkStateHandlerObserver overrides.
   void DefaultNetworkChanged(const NetworkState* network) override;
   void NetworkPropertiesUpdated(const NetworkState* network) override;
 
@@ skipping 151 matching lines @@
 
   base::ObserverList<Observer> observers_;
   base::WeakPtrFactory<MobileActivator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MobileActivator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_