Move Extension into extensions namespace

chrome/browser/extensions/extension_prefs.cc

Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 180fee382e89e83e295157e37c3f0b3f49030af6..9e9eb15ef08e33db2e24358c59625d4d4c90113d 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -21,6 +21,9 @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 
+using extensions::Extension;
+using extensions::ExtensionInfo;
+
 namespace {
 
 // Additional preferences keys
@@ -850,8 +853,8 @@ void ExtensionPrefs::SetActiveBit(const std::string& extension_id,
 
 void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
   ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
-  for (ExtensionIdSet::const_iterator ext_id = extension_ids.begin();
-       ext_id != extension_ids.end(); ++ext_id) {
+  for (ExtensionIdSet::const_iterator ext_id =
+       extension_ids.begin(); ext_id != extension_ids.end(); ++ext_id) {
 
     // An extension's granted permissions need to be migrated if the
     // full_access bit is present. This bit was always present in the previous
@@ -1161,7 +1164,7 @@ bool ExtensionPrefs::IsExtensionDisabled(
 }
 
 std::vector<std::string> ExtensionPrefs::GetToolbarOrder() {
-  ExtensionPrefs::ExtensionIdSet extension_ids;
+  ExtensionIdSet extension_ids;
   const ListValue* toolbar_order = prefs_->GetList(kExtensionToolbar);
   if (toolbar_order) {
     for (size_t i = 0; i < toolbar_order->GetSize(); ++i) {