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 a0eb5e7..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
@@ -5,17 +5,19 @@
 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
 
 #include "base/message_loop/message_loop.h"
-#include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/browser/info_map.h"
+#include "ipc/ipc_message.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::ResourceRequestInfo;
+using content::ResourceType;
 using extensions::Extension;
 using extensions::Manifest;
 using extension_test_util::LoadManifestUnchecked;
@@ -35,7 +37,7 @@ class ExtensionWebRequestHelpersTestWithThreadsTest : public testing::Test {
   scoped_refptr<Extension> permissionless_extension_;
   // This extension has Web Request permissions, and *.com a host permission.
   scoped_refptr<Extension> com_extension_;
-  scoped_refptr<ExtensionInfoMap> extension_info_map_;
+  scoped_refptr<extensions::InfoMap> extension_info_map_;
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
@@ -60,12 +62,16 @@ void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() {
                             "ext_id_2",
                             &error);
   ASSERT_TRUE(com_extension_.get()) << error;
-  extension_info_map_ = new ExtensionInfoMap;
+  extension_info_map_ = new extensions::InfoMap;
   extension_info_map_->AddExtension(permissionless_extension_.get(),
                                     base::Time::Now(),
-                                    false /*incognito_enabled*/);
+                                    false /*incognito_enabled*/,
+                                    false /*notifications_disabled*/);
   extension_info_map_->AddExtension(
-      com_extension_.get(), base::Time::Now(), false /*incognito_enabled*/);
+      com_extension_.get(),
+      base::Time::Now(),
+      false /*incognito_enabled*/,
+      false /*notifications_disabled*/);
 }
 
 TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
@@ -80,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/"
@@ -119,12 +128,16 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
   {
     int process_id = 42;
     int site_instance_id = 23;
-    int frame_id = 17;
+    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, frame_id, 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(),
@@ -133,12 +146,16 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
   // If the process is the signin process, it becomes protected.
   {
     int process_id = kSigninProcessId;
-    int frame_id = 19;
+    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, frame_id, 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));
   }