Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / web_request / web_request_permissions_unittest.cc

diff --git a/src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index 2b90594..117c550 100644 (file)
--- a/src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -17,6 +17,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::ResourceRequestInfo;
+using content::ResourceType;
 using extensions::Extension;
 using extensions::Manifest;
 using extension_test_util::LoadManifestUnchecked;
@@ -85,7 +86,10 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
       "https://clients2.google.com/service/update2/crx",
       "http://www.gstatic.com/chrome/extensions/blacklist",
       "https://www.gstatic.com/chrome/extensions/blacklist",
-      "notregisteredscheme://www.foobar.com"
+      "notregisteredscheme://www.foobar.com",
+      "https://chrome.google.com/webstore/",
+      "https://chrome.google.com/webstore/"
+          "inlineinstall/detail/kcnhkahnjcbndmmehfkdnkjomaanaooo"
   };
   const char* non_sensitive_urls[] = {
       "http://www.google.com/"
@@ -127,9 +131,13 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
     int view_id = 17;
     net::TestURLRequest sensitive_request(
         non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context);
-    ResourceRequestInfo::AllocateForTesting(
-        &sensitive_request, ResourceType::SCRIPT, NULL,
-        process_id, view_id, MSG_ROUTING_NONE, false);
+    ResourceRequestInfo::AllocateForTesting(&sensitive_request,
+                                            content::RESOURCE_TYPE_SCRIPT,
+                                            NULL,
+                                            process_id,
+                                            view_id,
+                                            MSG_ROUTING_NONE,
+                                            false);
     extension_info_map_->RegisterExtensionProcess(
         extension_misc::kWebStoreAppId, process_id, site_instance_id);
     EXPECT_TRUE(WebRequestPermissions::HideRequest(extension_info_map_.get(),
@@ -141,9 +149,13 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
     int view_id = 19;
     net::TestURLRequest sensitive_request(
         non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context);
-    ResourceRequestInfo::AllocateForTesting(
-        &sensitive_request, ResourceType::SCRIPT, NULL,
-        process_id, view_id, MSG_ROUTING_NONE, false);
+    ResourceRequestInfo::AllocateForTesting(&sensitive_request,
+                                            content::RESOURCE_TYPE_SCRIPT,
+                                            NULL,
+                                            process_id,
+                                            view_id,
+                                            MSG_ROUTING_NONE,
+                                            false);
     EXPECT_TRUE(WebRequestPermissions::HideRequest(extension_info_map_.get(),
                                                    &sensitive_request));
   }