Move Singleton and related structs to namespace base

remoting/base/service_urls.h

 // Copyright 2014 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 REMOTING_BASE_SERVICE_URLS_H_
 #define REMOTING_BASE_SERVICE_URLS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
   const std::string& xmpp_server_address_for_me2me_host() const;
   bool xmpp_server_use_tls() const;
 
   // Remoting directory bot JID (for registering hosts, logging, heartbeats).
   const std::string& directory_bot_jid() const;
 
   // JID for communicating with GCD.
   const std::string& gcd_jid() const;
 
  private:
-  friend struct DefaultSingletonTraits<ServiceUrls>;
+  friend struct base::DefaultSingletonTraits<ServiceUrls>;
 
   ServiceUrls();
   virtual ~ServiceUrls();
 
   std::string directory_base_url_;
   std::string directory_hosts_url_;
   std::string gcd_base_url_;
   std::string xmpp_server_address_;
   std::string xmpp_server_address_for_me2me_host_;
   bool xmpp_server_use_tls_;
   std::string directory_bot_jid_;
   std::string gcd_jid_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceUrls);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_SERVICE_URLS_H_