Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / permissions / permissions_api_helpers_unittest.cc

diff --git a/src/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/src/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index fe3e860..04cff0d 100644 (file)
--- a/src/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/src/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -30,14 +30,14 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
 TEST(ExtensionPermissionsAPIHelpers, Pack) {
   APIPermissionSet apis;
   apis.insert(APIPermission::kTab);
-  apis.insert(APIPermission::kWebRequest);
-  // Note: kWebRequest implies also kWebRequestInternal.
+  apis.insert(APIPermission::kFileBrowserHandler);
+  // Note: kFileBrowserHandler implies kFileBrowserHandlerInternal.
   URLPatternSet hosts;
   AddPattern(&hosts, "http://a.com/*");
   AddPattern(&hosts, "http://b.com/*");
 
   scoped_refptr<PermissionSet> permission_set =
-      new PermissionSet(apis, hosts, URLPatternSet());
+      new PermissionSet(apis, ManifestPermissionSet(), hosts, URLPatternSet());
 
   // Pack the permission set to value and verify its contents.
   scoped_ptr<Permissions> permissions(PackPermissionSet(permission_set.get()));
@@ -50,15 +50,16 @@ TEST(ExtensionPermissionsAPIHelpers, Pack) {
   EXPECT_EQ(3u, api_list->GetSize());
   EXPECT_EQ(2u, origin_list->GetSize());
 
-  std::string expected_apis[] = { "tabs", "webRequest" };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected_apis); ++i) {
-    scoped_ptr<Value> value(new base::StringValue(expected_apis[i]));
+  std::string expected_apis[] = {"tabs", "fileBrowserHandler",
+                                 "fileBrowserHandlerInternal"};
+  for (size_t i = 0; i < arraysize(expected_apis); ++i) {
+    scoped_ptr<base::Value> value(new base::StringValue(expected_apis[i]));
     EXPECT_NE(api_list->end(), api_list->Find(*value));
   }
 
   std::string expected_origins[] = { "http://a.com/*", "http://b.com/*" };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected_origins); ++i) {
-    scoped_ptr<Value> value(new base::StringValue(expected_origins[i]));
+  for (size_t i = 0; i < arraysize(expected_origins); ++i) {
+    scoped_ptr<base::Value> value(new base::StringValue(expected_origins[i]));
     EXPECT_NE(origin_list->end(), origin_list->Find(*value));
   }