Move Singleton and related structs to namespace base

remoting/base/service_urls.cc

 // 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.
 
 #include "remoting/base/service_urls.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 
 // Configurable service data.
@@ skipping 56 matching lines @@
   }
 #endif  // !defined(NDEBUG)
 
   directory_hosts_url_ = directory_base_url_ + kDirectoryHostsSuffix;
 }
 
 ServiceUrls::~ServiceUrls() {
 }
 
 ServiceUrls* remoting::ServiceUrls::GetInstance() {
-  return Singleton<ServiceUrls>::get();
+  return base::Singleton<ServiceUrls>::get();
 }
 
 const std::string& ServiceUrls::directory_base_url() const {
   return directory_base_url_;
 }
 
 const std::string& ServiceUrls::directory_hosts_url() const {
   return directory_hosts_url_;
 }
 
@@ skipping 15 matching lines @@
 
 const std::string& ServiceUrls::directory_bot_jid() const {
   return directory_bot_jid_;
 }
 
 const std::string& ServiceUrls::gcd_jid() const {
   return directory_bot_jid_;
 }
 
 }  // namespace remoting