Move Singleton and related structs to namespace base

chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc

 // Copyright 2015 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/net/utility_process_mojo_proxy_resolver_factory.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/service_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 const int kUtilityProcessIdleTimeoutSeconds = 5;
 }
 
 // static
 UtilityProcessMojoProxyResolverFactory*
 UtilityProcessMojoProxyResolverFactory::GetInstance() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  return Singleton<
-      UtilityProcessMojoProxyResolverFactory,
-      LeakySingletonTraits<UtilityProcessMojoProxyResolverFactory>>::get();
+  return base::Singleton<UtilityProcessMojoProxyResolverFactory,
+                         base::LeakySingletonTraits<
+                             UtilityProcessMojoProxyResolverFactory>>::get();
 }
 
 UtilityProcessMojoProxyResolverFactory::
     UtilityProcessMojoProxyResolverFactory() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 }
 
 UtilityProcessMojoProxyResolverFactory::
     ~UtilityProcessMojoProxyResolverFactory() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 68 matching lines @@
   }
 }
 
 void UtilityProcessMojoProxyResolverFactory::OnIdleTimeout() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(num_proxy_resolvers_, 0u);
   delete weak_utility_process_host_.get();
   weak_utility_process_host_.reset();
   resolver_factory_.reset();
 }