Move Singleton and related structs to namespace base

chrome/browser/ui/views/app_list/win/app_list_service_win.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/views/app_list/win/app_list_service_win.h"
 
 #include <dwmapi.h>
 #include <sstream>
 
 #include "base/command_line.h"
@@ skipping 231 matching lines @@
       relaunch.GetCommandLineString(), app_name, hwnd);
   ::SetWindowText(hwnd, app_name.c_str());
   base::string16 icon_path = GetAppListIconPath();
   ui::win::SetAppIconForWindow(icon_path, hwnd);
 }
 
 }  // namespace
 
 // static
 AppListServiceWin* AppListServiceWin::GetInstance() {
-  return Singleton<AppListServiceWin,
-                   LeakySingletonTraits<AppListServiceWin> >::get();
+  return base::Singleton<AppListServiceWin,
+                         base::LeakySingletonTraits<AppListServiceWin>>::get();
 }
 
 AppListServiceWin::AppListServiceWin()
     : AppListServiceViews(scoped_ptr<AppListControllerDelegate>(
           new AppListControllerDelegateWin(this))) {
 }
 
 AppListServiceWin::~AppListServiceWin() {
 }
 
@@ skipping 145 matching lines @@
   activation_tracker_.reset(new ActivationTrackerWin(this));
 }
 
 void AppListServiceWin::OnViewDismissed() {
   activation_tracker_->OnViewHidden();
 }
 
 void AppListServiceWin::MoveNearCursor(app_list::AppListView* view) {
   AppListWin::MoveNearCursor(view);
 }