Move Singleton and related structs to namespace base

chrome/browser/ui/ash/app_list/app_list_service_ash.cc

 // Copyright 2013 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/ash/app_list/app_list_service_ash.h"
 
 #include "ash/shell.h"
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/start_page_service.h"
 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/app_list/views/contents_view.h"
 
 // static
 AppListServiceAsh* AppListServiceAsh::GetInstance() {
-  return Singleton<AppListServiceAsh,
-                   LeakySingletonTraits<AppListServiceAsh> >::get();
+  return base::Singleton<AppListServiceAsh,
+                         base::LeakySingletonTraits<AppListServiceAsh>>::get();
 }
 
 AppListServiceAsh::AppListServiceAsh()
     : controller_delegate_(new AppListControllerDelegateAsh()) {
 }
 
 AppListServiceAsh::~AppListServiceAsh() {
 }
 
 void AppListServiceAsh::ShowAndSwitchToState(
@@ skipping 115 matching lines @@
   return AppListServiceAsh::GetInstance();
 }
 
 // static
 void AppListService::InitAll(Profile* initial_profile,
                              const base::FilePath& profile_path) {
   AppListServiceAsh::GetInstance()->Init(initial_profile);
 }
 
 #endif  // !defined(OS_WIN)