Move Singleton and related structs to namespace base

chrome/browser/chromeos/mobile/mobile_activator.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/mobile_activator.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 164 matching lines @@
       final_OTASP_attempts_(0),
       payment_reconnect_count_(0),
       weak_ptr_factory_(this) {
 }
 
 MobileActivator::~MobileActivator() {
   TerminateActivation();
 }
 
 MobileActivator* MobileActivator::GetInstance() {
-  return Singleton<MobileActivator>::get();
+  return base::Singleton<MobileActivator>::get();
 }
 
 void MobileActivator::TerminateActivation() {
   state_duration_timer_.Stop();
   continue_reconnect_timer_.Stop();
   reconnect_timeout_timer_.Stop();
 
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->
         RemoveObserver(this, FROM_HERE);
@@ skipping 967 matching lines @@
   cellular_plan_payment_time_ = base::Time::Now();
 }
 
 bool MobileActivator::HasRecentCellularPlanPayment() const {
   const int kRecentPlanPaymentHours = 6;
   return (base::Time::Now() -
           cellular_plan_payment_time_).InHours() < kRecentPlanPaymentHours;
 }
 
 }  // namespace chromeos