Move Singleton and related structs to namespace base

google_apis/gaia/gaia_urls.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 GOOGLE_APIS_GAIA_GAIA_URLS_H_
 #define GOOGLE_APIS_GAIA_GAIA_URLS_H_
 
 #include <string>
 
 #include "base/memory/singleton.h"
@@ skipping 42 matching lines @@
   GURL LogOutURLWithSource(const std::string& source);
   GURL GetCheckConnectionInfoURLWithSource(const std::string& source);
 
   // Continue URL used to signal the completion of the signin flow.
   GURL signin_completed_continue_url() const;
 
  private:
   GaiaUrls();
   ~GaiaUrls();
 
-  friend struct DefaultSingletonTraits<GaiaUrls>;
+  friend struct base::DefaultSingletonTraits<GaiaUrls>;
 
   GURL google_url_;
   GURL gaia_url_;
   GURL captcha_base_url_;
 
   GURL lso_origin_url_;
   GURL google_apis_origin_url_;
 
   GURL client_login_url_;
   GURL service_login_url_;
@@ skipping 25 matching lines @@
   GURL oauth2_token_info_url_;
   GURL oauth2_revoke_url_;
   GURL oauth2_iframe_url_;
 
   GURL gaia_login_form_realm_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaUrls);
 };
 
 #endif  // GOOGLE_APIS_GAIA_GAIA_URLS_H_