Move Singleton and related structs to namespace base

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
 #include "ui/app_list/app_list_model.h"
 
 class AppListControllerDelegateAsh;
+
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}
 
 // AppListServiceAsh wraps functionality in ChromeLauncherController and the Ash
 // Shell for showing and hiding the app list on the Ash desktop.
 class AppListServiceAsh : public AppListServiceImpl {
  public:
   static AppListServiceAsh* GetInstance();
 
   // AppListService overrides:
   void Init(Profile* initial_profile) override;
 
   // ProfileInfoCacheObserver overrides:
   // On ChromeOS this should never happen. On other platforms, there is always a
   // Non-ash AppListService that is responsible for handling this.
   // TODO(calamity): Ash shouldn't observe the ProfileInfoCache at all.
   void OnProfileWillBeRemoved(const base::FilePath& profile_path) override;
 
  private:
-  friend struct DefaultSingletonTraits<AppListServiceAsh>;
+  friend struct base::DefaultSingletonTraits<AppListServiceAsh>;
 
   AppListServiceAsh();
   ~AppListServiceAsh() override;
 
   // Shows the app list if it isn't already showing and Switches to |state|,
   // unless it is |INVALID_STATE| (in which case, opens on the default state).
   void ShowAndSwitchToState(app_list::AppListModel::State state);
 
   // AppListService overrides:
   base::FilePath GetProfilePath(const base::FilePath& user_data_dir) override;
@@ skipping 14 matching lines @@
   // ApplistServiceImpl overrides:
   void CreateForProfile(Profile* default_profile) override;
   void DestroyAppList() override;
 
   scoped_ptr<AppListControllerDelegateAsh> controller_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_