Move Singleton and related structs to namespace base

google_apis/gaia/gaia_urls.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 "google_apis/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/gaia/gaia_switches.h"
@@ skipping 55 matching lines @@
   GetSwitchValueWithDefault(switch_value, default_value, &string_value);
   const GURL result(string_value);
   DCHECK(result.is_valid());
   return result;
 }
 
 
 }  // namespace
 
 GaiaUrls* GaiaUrls::GetInstance() {
-  return Singleton<GaiaUrls>::get();
+  return base::Singleton<GaiaUrls>::get();
 }
 
 GaiaUrls::GaiaUrls() {
   google_url_ = GetURLSwitchValueWithDefault(switches::kGoogleUrl,
                                              kDefaultGoogleUrl);
   gaia_url_ = GetURLSwitchValueWithDefault(switches::kGaiaUrl, kDefaultGaiaUrl);
   lso_origin_url_ =
       GetURLSwitchValueWithDefault(switches::kLsoUrl, kDefaultGaiaUrl);
   google_apis_origin_url_ = GetURLSwitchValueWithDefault(
       switches::kGoogleApisUrl, kDefaultGoogleApisBaseUrl);
@@ skipping 194 matching lines @@
   return source.empty()
       ? get_check_connection_info_url_
       : get_check_connection_info_url_.Resolve(
             base::StringPrintf("?source=%s", source.c_str()));
 }
 
 GURL GaiaUrls::signin_completed_continue_url() const {
   return
       GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html");
 }