Code generation for extensions api

chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc

Index: chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc
diff --git a/chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc b/chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc
index 939db3aea244e717f9bc3a5e4deb73a588be9de6..3dd5a84ee885f7c8ae6471ebcd2cc73a68ce6cc7 100644
--- a/chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/extension_permissions_api_helpers_unittest.cc
@@ -11,7 +11,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::permissions_api::PackPermissionsToValue;
-using extensions::permissions_api::UnpackPermissionsFromValue;
+using extensions::permissions_api::UnpackPermissionSet;
 
 namespace {
 
@@ -61,7 +61,7 @@ TEST(ExtensionPermissionsAPIHelpers, Pack) {
   scoped_refptr<ExtensionPermissionSet> from_value;
   bool bad_message = false;
   std::string error;
-  ASSERT_TRUE(UnpackPermissionsFromValue(
+  ASSERT_TRUE(UnpackPermissionSet(

[Yoyo Zhou, 2012/01/19 23:19:11]

This file looks like it needs more changes than just this.

[calamity, 2012/01/23 05:14:45]

Done.

       value.get(), &from_value, &bad_message, &error));
   ASSERT_FALSE(bad_message);
   ASSERT_TRUE(error.empty());
@@ -84,7 +84,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
 
   // Origins shouldn't have to be present.
   value->Set("permissions", apis->DeepCopy());
-  ASSERT_TRUE(UnpackPermissionsFromValue(
+  ASSERT_TRUE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_TRUE(permissions->HasAPIPermission(ExtensionAPIPermission::kTab));
   ASSERT_FALSE(bad_message);
@@ -93,7 +93,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
   // The api permissions don't need to be present either.
   value->Clear();
   value->Set("origins", origins->DeepCopy());
-  ASSERT_TRUE(UnpackPermissionsFromValue(
+  ASSERT_TRUE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_FALSE(bad_message);
   ASSERT_TRUE(error.empty());
@@ -104,7 +104,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
   scoped_ptr<ListValue> invalid_apis(apis->DeepCopy());
   invalid_apis->Append(Value::CreateIntegerValue(3));
   value->Set("permissions", invalid_apis->DeepCopy());
-  ASSERT_FALSE(UnpackPermissionsFromValue(
+  ASSERT_FALSE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_TRUE(bad_message);
   bad_message = false;
@@ -114,7 +114,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
   scoped_ptr<ListValue> invalid_origins(origins->DeepCopy());
   invalid_origins->Append(Value::CreateIntegerValue(3));
   value->Set("origins", invalid_origins->DeepCopy());
-  ASSERT_FALSE(UnpackPermissionsFromValue(
+  ASSERT_FALSE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_TRUE(bad_message);
   bad_message = false;
@@ -122,14 +122,14 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
   // Throw errors when "origins" or "permissions" are not list values.
   value->Clear();
   value->Set("origins", Value::CreateIntegerValue(2));
-  ASSERT_FALSE(UnpackPermissionsFromValue(
+  ASSERT_FALSE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_TRUE(bad_message);
   bad_message = false;
 
   value->Clear();
   value->Set("permissions", Value::CreateIntegerValue(2));
-  ASSERT_FALSE(UnpackPermissionsFromValue(
+  ASSERT_FALSE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_TRUE(bad_message);
   bad_message = false;
@@ -138,7 +138,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
   value->Clear();
   value->Set("origins", origins->DeepCopy());
   value->Set("random", Value::CreateIntegerValue(3));
-  ASSERT_TRUE(UnpackPermissionsFromValue(
+  ASSERT_TRUE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_FALSE(bad_message);
   ASSERT_TRUE(error.empty());
@@ -149,7 +149,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
   invalid_apis.reset(apis->DeepCopy());
   invalid_apis->Append(Value::CreateStringValue("unknown_permission"));
   value->Set("permissions", invalid_apis->DeepCopy());
-  ASSERT_FALSE(UnpackPermissionsFromValue(
+  ASSERT_FALSE(UnpackPermissionSet(
       value.get(), &permissions, &bad_message, &error));
   ASSERT_FALSE(bad_message);
   ASSERT_FALSE(error.empty());