Rename Feature::(UN)PRIVILEGED_CONTEXT to (UN)BLESSED_EXTENSION_CONTEXT.

Note that I haven't updated simliar terminology used throughout the existing
JSON schema files ("unprivileged": true) because that's slightly different, and
it's probably not worth worrying about now due to impending replacement of
that logic with Feature.


TEST=unit_test --gtest_filter=*Feature*


Review URL: http://codereview.chromium.org/9617040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127938 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 34 insertions, 32 deletions

diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index 243d2e6..303c6c2 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -282,16 +282,17 @@ scoped_ptr<std::set<std::string> > ExtensionAPI::GetAPIsForContext(
     case Feature::UNSPECIFIED_CONTEXT:
       break;
 
-    case Feature::PRIVILEGED_CONTEXT:
+    case Feature::BLESSED_EXTENSION_CONTEXT:
       // Availability is determined by the permissions of the extension.
       CHECK(extension);
       GetAllowedAPIs(extension, result.get());
       ResolveDependencies(result.get());
       break;
 
-    case Feature::UNPRIVILEGED_CONTEXT:
+    case Feature::UNBLESSED_EXTENSION_CONTEXT:
     case Feature::CONTENT_SCRIPT_CONTEXT:
-      // Same as PRIVILEGED_CONTEXT, but only those APIs that are unprivileged.
+      // Same as BLESSED_EXTENSION_CONTEXT, but only those APIs that are
+      // unprivileged.
       CHECK(extension);
       GetAllowedAPIs(extension, result.get());
       // Resolving dependencies before removing unprivileged APIs means that
diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc
index 3f4a0af..1bcf33b 100644
--- a/chrome/common/extensions/api/extension_api_unittest.cc
+++ b/chrome/common/extensions/api/extension_api_unittest.cc
@@ -86,11 +86,11 @@ TEST(ExtensionAPI, ExtensionWithUnprivilegedAPIs) {
 
   scoped_ptr<std::set<std::string> > privileged_apis =
       ExtensionAPI::GetInstance()->GetAPIsForContext(
-          Feature::PRIVILEGED_CONTEXT, extension.get(), GURL());
+          Feature::BLESSED_EXTENSION_CONTEXT, extension.get(), GURL());
 
   scoped_ptr<std::set<std::string> > unprivileged_apis =
       ExtensionAPI::GetInstance()->GetAPIsForContext(
-          Feature::UNPRIVILEGED_CONTEXT, extension.get(), GURL());
+          Feature::UNBLESSED_EXTENSION_CONTEXT, extension.get(), GURL());
 
   scoped_ptr<std::set<std::string> > content_script_apis =
       ExtensionAPI::GetInstance()->GetAPIsForContext(
@@ -120,7 +120,7 @@ TEST(ExtensionAPI, ExtensionWithDependencies) {
         CreateExtensionWithPermission("ttsEngine");
     scoped_ptr<std::set<std::string> > apis =
         ExtensionAPI::GetInstance()->GetAPIsForContext(
-            Feature::PRIVILEGED_CONTEXT, extension.get(), GURL());
+            Feature::BLESSED_EXTENSION_CONTEXT, extension.get(), GURL());
     EXPECT_EQ(1u, apis->count("ttsEngine"));
     EXPECT_EQ(1u, apis->count("tts"));
   }
@@ -132,7 +132,7 @@ TEST(ExtensionAPI, ExtensionWithDependencies) {
         CreateExtensionWithPermission("tts");
     scoped_ptr<std::set<std::string> > apis =
         ExtensionAPI::GetInstance()->GetAPIsForContext(
-            Feature::PRIVILEGED_CONTEXT, extension.get(), GURL());
+            Feature::BLESSED_EXTENSION_CONTEXT, extension.get(), GURL());
     EXPECT_EQ(0u, apis->count("ttsEngine"));
     EXPECT_EQ(1u, apis->count("tts"));
   }
diff --git a/chrome/common/extensions/feature.cc b/chrome/common/extensions/feature.cc
index d511c19..1bda59b 100644
--- a/chrome/common/extensions/feature.cc
+++ b/chrome/common/extensions/feature.cc
@@ -21,8 +21,10 @@ struct Mappings {
     extension_types["hosted_app"] = Extension::TYPE_HOSTED_APP;
     extension_types["platform_app"] = Extension::TYPE_PLATFORM_APP;
 
-    contexts["privileged"] = extensions::Feature::PRIVILEGED_CONTEXT;
-    contexts["unprivileged"] = extensions::Feature::UNPRIVILEGED_CONTEXT;
+    contexts["blessed_extension"] =
+        extensions::Feature::BLESSED_EXTENSION_CONTEXT;
+    contexts["unblessed_extension"] =
+        extensions::Feature::UNBLESSED_EXTENSION_CONTEXT;
     contexts["content_script"] = extensions::Feature::CONTENT_SCRIPT_CONTEXT;
     contexts["web_page"] = extensions::Feature::WEB_PAGE_CONTEXT;
 
diff --git a/chrome/common/extensions/feature.h b/chrome/common/extensions/feature.h
index 749f4b3..6423ccb 100644
--- a/chrome/common/extensions/feature.h
+++ b/chrome/common/extensions/feature.h
@@ -22,15 +22,14 @@ namespace extensions {
 class Feature {
  public:
   // The JavaScript contexts the feature is supported in.
-  // TODO(kalman): s/PRIVILEGED/BLESSED_EXTENSION/
   enum Context {
     UNSPECIFIED_CONTEXT,
 
     // A context in a privileged extension process.
-    PRIVILEGED_CONTEXT,
+    BLESSED_EXTENSION_CONTEXT,
 
-    // A context in a normal, unprivileged renderer.
-    UNPRIVILEGED_CONTEXT,
+    // A context in an unprivileged extension process.
+    UNBLESSED_EXTENSION_CONTEXT,
 
     // A context from a content script.
     CONTENT_SCRIPT_CONTEXT,
diff --git a/chrome/common/extensions/feature_unittest.cc b/chrome/common/extensions/feature_unittest.cc
index 432e4ac..4442744 100644
--- a/chrome/common/extensions/feature_unittest.cc
+++ b/chrome/common/extensions/feature_unittest.cc
@@ -33,7 +33,7 @@ TEST(ExtensionFeatureTest, IsAvailableNullCase) {
     { "", Extension::TYPE_PACKAGED_APP, Feature::UNSPECIFIED_CONTEXT,
       Feature::UNSPECIFIED_LOCATION, Feature::UNSPECIFIED_PLATFORM, -1,
       Feature::IS_AVAILABLE },
-    { "", Extension::TYPE_UNKNOWN, Feature::PRIVILEGED_CONTEXT,
+    { "", Extension::TYPE_UNKNOWN, Feature::BLESSED_EXTENSION_CONTEXT,
       Feature::UNSPECIFIED_LOCATION, Feature::UNSPECIFIED_PLATFORM, -1,
       Feature::IS_AVAILABLE },
     { "", Extension::TYPE_UNKNOWN, Feature::UNSPECIFIED_CONTEXT,
@@ -104,19 +104,19 @@ TEST(ExtensionFeatureTest, PackageType) {
 
 TEST(ExtensionFeatureTest, Context) {
   Feature feature;
-  feature.contexts()->insert(Feature::PRIVILEGED_CONTEXT);
+  feature.contexts()->insert(Feature::BLESSED_EXTENSION_CONTEXT);
   feature.contexts()->insert(Feature::CONTENT_SCRIPT_CONTEXT);
 
   EXPECT_EQ(Feature::IS_AVAILABLE, feature.IsAvailable(
       "", Extension::TYPE_UNKNOWN, Feature::UNSPECIFIED_LOCATION,
-      Feature::PRIVILEGED_CONTEXT, Feature::UNSPECIFIED_PLATFORM, -1));
+      Feature::BLESSED_EXTENSION_CONTEXT, Feature::UNSPECIFIED_PLATFORM, -1));
   EXPECT_EQ(Feature::IS_AVAILABLE, feature.IsAvailable(
       "", Extension::TYPE_UNKNOWN, Feature::UNSPECIFIED_LOCATION,
       Feature::CONTENT_SCRIPT_CONTEXT, Feature::UNSPECIFIED_PLATFORM, -1));
 
   EXPECT_EQ(Feature::INVALID_CONTEXT, feature.IsAvailable(
       "", Extension::TYPE_UNKNOWN, Feature::UNSPECIFIED_LOCATION,
-      Feature::UNPRIVILEGED_CONTEXT, Feature::UNSPECIFIED_PLATFORM, -1));
+      Feature::UNBLESSED_EXTENSION_CONTEXT, Feature::UNSPECIFIED_PLATFORM, -1));
   EXPECT_EQ(Feature::INVALID_CONTEXT, feature.IsAvailable(
       "", Extension::TYPE_UNKNOWN, Feature::UNSPECIFIED_LOCATION,
       Feature::UNSPECIFIED_CONTEXT, Feature::UNSPECIFIED_PLATFORM, -1));
@@ -233,15 +233,15 @@ TEST(ExtensionFeatureTest, ParsePackageTypes) {
 TEST(ExtensionFeatureTest, ParseContexts) {
   scoped_ptr<DictionaryValue> value(new DictionaryValue());
   ListValue* contexts = new ListValue();
-  contexts->Append(Value::CreateStringValue("privileged"));
-  contexts->Append(Value::CreateStringValue("unprivileged"));
+  contexts->Append(Value::CreateStringValue("blessed_extension"));
+  contexts->Append(Value::CreateStringValue("unblessed_extension"));
   contexts->Append(Value::CreateStringValue("content_script"));
   contexts->Append(Value::CreateStringValue("web_page"));
   value->Set("contexts", contexts);
   scoped_ptr<Feature> feature(Feature::Parse(value.get()));
   EXPECT_EQ(4u, feature->contexts()->size());
-  EXPECT_TRUE(feature->contexts()->count(Feature::PRIVILEGED_CONTEXT));
-  EXPECT_TRUE(feature->contexts()->count(Feature::UNPRIVILEGED_CONTEXT));
+  EXPECT_TRUE(feature->contexts()->count(Feature::BLESSED_EXTENSION_CONTEXT));
+  EXPECT_TRUE(feature->contexts()->count(Feature::UNBLESSED_EXTENSION_CONTEXT));
   EXPECT_TRUE(feature->contexts()->count(Feature::CONTENT_SCRIPT_CONTEXT));
   EXPECT_TRUE(feature->contexts()->count(Feature::WEB_PAGE_CONTEXT));
 
diff --git a/chrome/common/extensions/simple_feature_provider_unittest.cc b/chrome/common/extensions/simple_feature_provider_unittest.cc
index 5eebf91..f6bffef 100644
--- a/chrome/common/extensions/simple_feature_provider_unittest.cc
+++ b/chrome/common/extensions/simple_feature_provider_unittest.cc
@@ -28,7 +28,7 @@ TEST(SimpleFeatureProvider, Validation) {
   extension_types->Append(Value::CreateStringValue("extension"));
   feature2->Set("extension_types", extension_types);
   ListValue* contexts = new ListValue();
-  contexts->Append(Value::CreateStringValue("privileged"));
+  contexts->Append(Value::CreateStringValue("blessed_extension"));
   feature2->Set("contexts", contexts);
   value->Set("feature2", feature2);
 
diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc
index 6d59a19..8702081 100644
--- a/chrome/renderer/extensions/chrome_v8_context.cc
+++ b/chrome/renderer/extensions/chrome_v8_context.cc
@@ -28,11 +28,11 @@ const char kValidateAPI[] = "validateAPI";
 
 std::string GetContextTypeDescription(Feature::Context context_type) {
   switch (context_type) {
-    case Feature::UNSPECIFIED_CONTEXT:    return "unspecified";
-    case Feature::PRIVILEGED_CONTEXT:     return "privileged";
-    case Feature::UNPRIVILEGED_CONTEXT:   return "unprivileged";
-    case Feature::CONTENT_SCRIPT_CONTEXT: return "content script";
-    case Feature::WEB_PAGE_CONTEXT:       return "web page";
+    case Feature::UNSPECIFIED_CONTEXT:         return "unspecified";
+    case Feature::BLESSED_EXTENSION_CONTEXT:   return "blessed extension";
+    case Feature::UNBLESSED_EXTENSION_CONTEXT: return "unblessed extension";
+    case Feature::CONTENT_SCRIPT_CONTEXT:      return "content script";
+    case Feature::WEB_PAGE_CONTEXT:            return "web page";
   }
   NOTREACHED();
   return "";
diff --git a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc
index af7b17d..818e2cd 100644
--- a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc
+++ b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc
@@ -26,7 +26,7 @@ TEST(ChromeV8ContextSet, Lifecycle) {
       v8_context,
       frame,
       extension_id,
-      extensions::Feature::PRIVILEGED_CONTEXT);
+      extensions::Feature::BLESSED_EXTENSION_CONTEXT);
 
   context_set.Add(context);
   EXPECT_EQ(1u, context_set.GetAll().count(context));
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 9f3e4f1..7e9e0c9 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -486,8 +486,8 @@ void ExtensionDispatcher::DidCreateScriptContext(
     case Feature::WEB_PAGE_CONTEXT:
       break;
 
-    case Feature::PRIVILEGED_CONTEXT:
-    case Feature::UNPRIVILEGED_CONTEXT:
+    case Feature::BLESSED_EXTENSION_CONTEXT:
+    case Feature::UNBLESSED_EXTENSION_CONTEXT:
     case Feature::CONTENT_SCRIPT_CONTEXT:
       module_system->Require("json_schema");
       module_system->Require("event_bindings");
@@ -698,10 +698,10 @@ Feature::Context ExtensionDispatcher::ClassifyJavaScriptContext(
     return Feature::CONTENT_SCRIPT_CONTEXT;
 
   if (IsExtensionActive(extension_id))
-    return Feature::PRIVILEGED_CONTEXT;
+    return Feature::BLESSED_EXTENSION_CONTEXT;
 
   if (extensions_.ExtensionBindingsAllowed(url_info))
-    return Feature::UNPRIVILEGED_CONTEXT;
+    return Feature::UNBLESSED_EXTENSION_CONTEXT;
 
   if (url_info.url().is_valid())
     return Feature::WEB_PAGE_CONTEXT;