Move Singleton and related structs to namespace base

chrome/browser/extensions/extension_assets_manager_chromeos.cc

 // Copyright (c) 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/extensions/extension_assets_manager_chromeos.h"
 
 #include <map>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 38 matching lines @@
   struct PendingInstallInfo {
     base::FilePath unpacked_extension_root;
     base::FilePath local_install_dir;
     Profile* profile;
     ExtensionAssetsManager::InstallExtensionCallback callback;
   };
   typedef std::vector<PendingInstallInfo> PendingInstallList;
 
   static ExtensionAssetsManagerHelper* GetInstance() {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    return Singleton<ExtensionAssetsManagerHelper>::get();
+    return base::Singleton<ExtensionAssetsManagerHelper>::get();
   }
 
   // Remember that shared install is in progress. Return true if there is no
   // other installs for given id and version.
   bool RecordSharedInstall(
       const std::string& id,
       const std::string& version,
       const base::FilePath& unpacked_extension_root,
       const base::FilePath& local_install_dir,
       Profile* profile,
@@ skipping 17 matching lines @@
                          const std::string& version,
                          PendingInstallList* pending_installs) {
     InstallQueue::iterator it = install_queue_.find(
         InstallQueue::key_type(id, version));
     DCHECK(it != install_queue_.end());
     pending_installs->swap(it->second);
     install_queue_.erase(it);
   }
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionAssetsManagerHelper>;
+  friend struct base::DefaultSingletonTraits<ExtensionAssetsManagerHelper>;
 
   ExtensionAssetsManagerHelper() {}
   ~ExtensionAssetsManagerHelper() {}
 
   // Extension ID + version pair.
   typedef std::pair<std::string, std::string> InstallItem;
 
   // Queue of pending installs in progress.
   typedef std::map<InstallItem, std::vector<PendingInstallInfo> > InstallQueue;
 
@@ skipping 15 matching lines @@
 
 ExtensionAssetsManagerChromeOS::~ExtensionAssetsManagerChromeOS() {
   if (g_shared_install_dir_override) {
     delete g_shared_install_dir_override;
     g_shared_install_dir_override = NULL;
   }
 }
 
 // static
 ExtensionAssetsManagerChromeOS* ExtensionAssetsManagerChromeOS::GetInstance() {
-  return Singleton<ExtensionAssetsManagerChromeOS>::get();
+  return base::Singleton<ExtensionAssetsManagerChromeOS>::get();
 }
 
 // static
 void ExtensionAssetsManagerChromeOS::RegisterPrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(kSharedExtensions);
 }
 
 void ExtensionAssetsManagerChromeOS::InstallExtension(
     const Extension* extension,
@@ skipping 422 matching lines @@
           std::make_pair(id, base::FilePath(shared_path)));
     } else {
       extension_info->RemoveWithoutPathExpansion(*it, NULL);
     }
   }
 
   return true;
 }
 
 }  // namespace extensions