Move Singleton and related structs to namespace base

chrome/browser/ui/apps/chrome_app_window_client.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 "chrome/browser/ui/apps/chrome_app_window_client.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/common/extension.h"
 
 // TODO(jamescook): We probably shouldn't compile this class at all on Android.
 // See http://crbug.com/343612
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #endif
 
 ChromeAppWindowClient::ChromeAppWindowClient() {
 }
 
 ChromeAppWindowClient::~ChromeAppWindowClient() {
 }
 
 // static
 ChromeAppWindowClient* ChromeAppWindowClient::GetInstance() {
-  return Singleton<ChromeAppWindowClient,
-                   LeakySingletonTraits<ChromeAppWindowClient> >::get();
+  return base::Singleton<
+      ChromeAppWindowClient,
+      base::LeakySingletonTraits<ChromeAppWindowClient>>::get();
 }
 
 extensions::AppWindow* ChromeAppWindowClient::CreateAppWindow(
     content::BrowserContext* context,
     const extensions::Extension* extension) {
 #if defined(OS_ANDROID)
   return NULL;
 #else
   return new extensions::AppWindow(
       context,
@@ skipping 23 matching lines @@
       DevToolsWindow::FindDevToolsWindow(agent.get());
   if (devtools_window)
     devtools_window->SetLoadCompletedCallback(callback);
   else
     callback.Run();
 }
 
 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() {
   return extensions::GetCurrentChannel() > version_info::Channel::DEV;
 }