Move Singleton and related structs to namespace base

chrome/browser/extensions/activity_log/activity_log.cc

 // Copyright (c) 2011 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/activity_log/activity_log.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 136 matching lines @@
     {Action::ACTION_DOM_ACCESS, "Location.assign", 0, NONE, NULL},
     {Action::ACTION_DOM_ACCESS, "Location.replace", 0, NONE, NULL},
     {Action::ACTION_DOM_ACCESS, "Window.location", 0, NONE, NULL},
     {Action::ACTION_DOM_ACCESS, "XMLHttpRequest.open", 1, NONE, NULL}};
 
 // A singleton class which provides lookups into the kApiInfoTable data
 // structure.  It inserts all data into a map on first lookup.
 class ApiInfoDatabase {
  public:
   static ApiInfoDatabase* GetInstance() {
-    return Singleton<ApiInfoDatabase>::get();
+    return base::Singleton<ApiInfoDatabase>::get();
   }
 
   // Retrieves an ApiInfo record for the given Action type.  Returns either a
   // pointer to the record, or NULL if no such record was found.
   const ApiInfo* Lookup(Action::ActionType action_type,
                         const std::string& api_name) const {
     std::map<std::string, const ApiInfo*>::const_iterator i =
         api_database_.find(api_name);
     if (i == api_database_.end())
       return NULL;
     if (i->second->action_type != action_type)
       return NULL;
     return i->second;
   }
 
  private:
   ApiInfoDatabase() {
     for (size_t i = 0; i < arraysize(kApiInfoTable); i++) {
       const ApiInfo* info = &kApiInfoTable[i];
       api_database_[info->api_name] = info;
     }
   }
   virtual ~ApiInfoDatabase() {}
 
   // The map is keyed by API name only, since API names aren't be repeated
   // across multiple action types in kApiInfoTable.  However, the action type
   // should still be checked before returning a positive match.
   std::map<std::string, const ApiInfo*> api_database_;
 
-  friend struct DefaultSingletonTraits<ApiInfoDatabase>;
+  friend struct base::DefaultSingletonTraits<ApiInfoDatabase>;
   DISALLOW_COPY_AND_ASSIGN(ApiInfoDatabase);
 };
 
 // Gets the URL for a given tab ID.  Helper method for ExtractUrls.  Returns
 // true if able to perform the lookup.  The URL is stored to *url, and
 // *is_incognito is set to indicate whether the URL is for an incognito tab.
 bool GetUrlForTabId(int tab_id,
                     Profile* profile,
                     GURL* url,
                     bool* is_incognito) {
@@ skipping 458 matching lines @@
   database_policy_->DeleteDatabase();
 }
 
 template <>
 void BrowserContextKeyedAPIFactory<ActivityLog>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   DependsOn(ExtensionRegistryFactory::GetInstance());
 }
 
 }  // namespace extensions