Moved ExtensionPrefs and related into extensions namespace

chrome/browser/extensions/extension_pref_value_map.cc

Index: chrome/browser/extensions/extension_pref_value_map.cc
diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc
index 18586e06356ee9bed6180b76cfc565c0aa0262cd..8e750b94fd45aa1748f5c5115fba3ee2d2f7f7f2 100644
--- a/chrome/browser/extensions/extension_pref_value_map.cc
+++ b/chrome/browser/extensions/extension_pref_value_map.cc
@@ -8,6 +8,8 @@
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 
+using extensions::ExtensionPrefsScope;

[asargent_no_longer_on_chrome, 2012/07/09 18:13:38]

do you need this "using" statement if you're prefixing the usages of the
ExtensionPrefsScope enum members below with "extensions::" ?

[Devlin, 2012/07/09 18:58:32]

This part was kind of annoying - the using is to avoid having to say
"extensions::ExtensionPrefsScope scope" whenever we have the scope as a type,
e.g. as a parameter to a function. It does not carry over to the enum members
themselves, so we must still prefix those with extensions::.

+
 struct ExtensionPrefValueMap::ExtensionEntry {
   // Installation time of the extension.
   base::Time install_time;
@@ -155,13 +157,13 @@ PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
   ExtensionEntryMap::const_iterator i = entries_.find(ext_id);
   CHECK(i != entries_.end());
   switch (scope) {
-    case kExtensionPrefsScopeRegular:
+    case extensions::kExtensionPrefsScopeRegular:
       return &(i->second->regular_profile_preferences);
-    case kExtensionPrefsScopeRegularOnly:
+    case extensions::kExtensionPrefsScopeRegularOnly:
       return &(i->second->regular_only_profile_preferences);
-    case kExtensionPrefsScopeIncognitoPersistent:
+    case extensions::kExtensionPrefsScopeIncognitoPersistent:
       return &(i->second->incognito_profile_preferences_persistent);
-    case kExtensionPrefsScopeIncognitoSessionOnly:
+    case extensions::kExtensionPrefsScopeIncognitoSessionOnly:
       return &(i->second->incognito_profile_preferences_session_only);
   }
   NOTREACHED();
@@ -174,13 +176,13 @@ const PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
   ExtensionEntryMap::const_iterator i = entries_.find(ext_id);
   CHECK(i != entries_.end());
   switch (scope) {
-    case kExtensionPrefsScopeRegular:
+    case extensions::kExtensionPrefsScopeRegular:
       return &(i->second->regular_profile_preferences);
-    case kExtensionPrefsScopeRegularOnly:
+    case extensions::kExtensionPrefsScopeRegularOnly:
       return &(i->second->regular_only_profile_preferences);
-    case kExtensionPrefsScopeIncognitoPersistent:
+    case extensions::kExtensionPrefsScopeIncognitoPersistent:
       return &(i->second->incognito_profile_preferences_persistent);
-    case kExtensionPrefsScopeIncognitoSessionOnly:
+    case extensions::kExtensionPrefsScopeIncognitoSessionOnly:
       return &(i->second->incognito_profile_preferences_session_only);
   }
   NOTREACHED();
@@ -227,22 +229,23 @@ const Value* ExtensionPrefValueMap::GetEffectivePrefValue(
   // First search for incognito session only preferences.
   if (incognito) {
     const PrefValueMap* prefs = GetExtensionPrefValueMap(
-        ext_id, kExtensionPrefsScopeIncognitoSessionOnly);
+        ext_id, extensions::kExtensionPrefsScopeIncognitoSessionOnly);
     prefs->GetValue(key, &value);
     if (value)
       return value;
 
     // If no incognito session only preference exists, fall back to persistent
     // incognito preference.
-    prefs = GetExtensionPrefValueMap(ext_id,
-                                     kExtensionPrefsScopeIncognitoPersistent);
+    prefs = GetExtensionPrefValueMap(
+        ext_id,
+        extensions::kExtensionPrefsScopeIncognitoPersistent);
     prefs->GetValue(key, &value);
     if (value)
       return value;
   } else {
     // Regular-only preference.
     const PrefValueMap* prefs = GetExtensionPrefValueMap(
-        ext_id, kExtensionPrefsScopeRegularOnly);
+        ext_id, extensions::kExtensionPrefsScopeRegularOnly);
     prefs->GetValue(key, &value);
     if (value)
       return value;
@@ -250,7 +253,7 @@ const Value* ExtensionPrefValueMap::GetEffectivePrefValue(
 
   // Regular preference.
   const PrefValueMap* prefs = GetExtensionPrefValueMap(
-      ext_id, kExtensionPrefsScopeRegular);
+      ext_id, extensions::kExtensionPrefsScopeRegular);
   prefs->GetValue(key, &value);
   return value;
 }
@@ -276,7 +279,7 @@ ExtensionPrefValueMap::GetEffectivePrefValueController(
 
     const Value* value = NULL;
     const PrefValueMap* prefs = GetExtensionPrefValueMap(
-        ext_id, kExtensionPrefsScopeRegular);
+        ext_id, extensions::kExtensionPrefsScopeRegular);
     if (prefs->GetValue(key, &value)) {
       winner = i;
       winners_install_time = install_time;
@@ -286,7 +289,7 @@ ExtensionPrefValueMap::GetEffectivePrefValueController(
 
     if (!incognito) {
       const PrefValueMap* prefs = GetExtensionPrefValueMap(
-          ext_id, kExtensionPrefsScopeRegularOnly);
+          ext_id, extensions::kExtensionPrefsScopeRegularOnly);
       if (prefs->GetValue(key, &value)) {
         winner = i;
         winners_install_time = install_time;
@@ -298,7 +301,7 @@ ExtensionPrefValueMap::GetEffectivePrefValueController(
     }
 
     prefs = GetExtensionPrefValueMap(
-        ext_id, kExtensionPrefsScopeIncognitoPersistent);
+        ext_id, extensions::kExtensionPrefsScopeIncognitoPersistent);
     if (prefs->GetValue(key, &value)) {
       winner = i;
       winners_install_time = install_time;
@@ -307,7 +310,7 @@ ExtensionPrefValueMap::GetEffectivePrefValueController(
     }
 
     prefs = GetExtensionPrefValueMap(
-        ext_id, kExtensionPrefsScopeIncognitoSessionOnly);
+        ext_id, extensions::kExtensionPrefsScopeIncognitoSessionOnly);
     if (prefs->GetValue(key, &value)) {
       winner = i;
       winners_install_time = install_time;