Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: chrome/browser/extensions/extension_resource_request_policy_apitest.cc

Issue 2221193002: Add testing configs for ParseHTMLOnMainThread experiment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit browsertest Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/test/base/test_switches.h" 12 #include "chrome/test/base/test_switches.h"
13 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "content/public/browser/navigation_handle.h" 14 #include "content/public/browser/navigation_handle.h"
15 #include "content/public/browser/notification_service.h"
15 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
16 #include "content/public/browser/web_contents_observer.h" 17 #include "content/public/browser/web_contents_observer.h"
17 #include "content/public/test/browser_test_utils.h" 18 #include "content/public/test/browser_test_utils.h"
18 #include "extensions/common/switches.h" 19 #include "extensions/common/switches.h"
19 #include "net/dns/mock_host_resolver.h" 20 #include "net/dns/mock_host_resolver.h"
20 #include "net/test/embedded_test_server/embedded_test_server.h" 21 #include "net/test/embedded_test_server/embedded_test_server.h"
21 #include "url/gurl.h" 22 #include "url/gurl.h"
22 23
23 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { 24 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest {
24 protected: 25 protected:
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 "/extensions/api_test/extension_resource_request_policy/" 255 "/extensions/api_test/extension_resource_request_policy/"
255 "web_accessible/nonaccessible_link_resource.html")); 256 "web_accessible/nonaccessible_link_resource.html"));
256 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), 257 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
257 nonaccessible_linked_resource, 2); 258 nonaccessible_linked_resource, 2);
258 ASSERT_TRUE(content::ExecuteScriptAndExtractString( 259 ASSERT_TRUE(content::ExecuteScriptAndExtractString(
259 browser()->tab_strip_model()->GetActiveWebContents(), 260 browser()->tab_strip_model()->GetActiveWebContents(),
260 "window.domAutomationController.send(document.URL)", 261 "window.domAutomationController.send(document.URL)",
261 &result)); 262 &result));
262 EXPECT_EQ("about:blank", result); 263 EXPECT_EQ("about:blank", result);
263 264
265 // Redirects can sometimes occur before the load event, so use a
266 // UrlLoadObserver instead of blocking waiting for two load events.
267 ui_test_utils::UrlLoadObserver accessible_observer(
268 GURL("chrome-extension://ggmldgjhdenlnjjjmehkomheglpmijnf/test.png"),
269 content::NotificationService::AllSources());
264 GURL accessible_client_redirect_resource(embedded_test_server()->GetURL( 270 GURL accessible_client_redirect_resource(embedded_test_server()->GetURL(
265 "/extensions/api_test/extension_resource_request_policy/" 271 "/extensions/api_test/extension_resource_request_policy/"
266 "web_accessible/accessible_redirect_resource.html")); 272 "web_accessible/accessible_redirect_resource.html"));
267 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), 273 ui_test_utils::NavigateToURL(browser(), accessible_client_redirect_resource);
268 accessible_client_redirect_resource, 2); 274 accessible_observer.Wait();
269 ASSERT_TRUE(content::ExecuteScriptAndExtractString(
270 browser()->tab_strip_model()->GetActiveWebContents(),
271 "window.domAutomationController.send(document.URL)",
272 &result));
273 EXPECT_NE("about:blank", result);
274 275
276 ui_test_utils::UrlLoadObserver nonaccessible_observer(
277 GURL("about:blank"), content::NotificationService::AllSources());
275 GURL nonaccessible_client_redirect_resource(embedded_test_server()->GetURL( 278 GURL nonaccessible_client_redirect_resource(embedded_test_server()->GetURL(
276 "/extensions/api_test/extension_resource_request_policy/" 279 "/extensions/api_test/extension_resource_request_policy/"
277 "web_accessible/nonaccessible_redirect_resource.html")); 280 "web_accessible/nonaccessible_redirect_resource.html"));
278 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), 281 ui_test_utils::NavigateToURL(browser(),
279 nonaccessible_client_redirect_resource, 2); 282 nonaccessible_client_redirect_resource);
280 ASSERT_TRUE(content::ExecuteScriptAndExtractString( 283 nonaccessible_observer.Wait();
281 browser()->tab_strip_model()->GetActiveWebContents(),
282 "window.domAutomationController.send(document.URL)",
283 &result));
284 EXPECT_EQ("about:blank", result);
285 } 284 }
286 285
287 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 286 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
288 WebAccessibleResourcesWithCSP) { 287 WebAccessibleResourcesWithCSP) {
289 std::string result; 288 std::string result;
290 ASSERT_TRUE(embedded_test_server()->Start()); 289 ASSERT_TRUE(embedded_test_server()->Start());
291 ASSERT_TRUE(LoadExtension(test_data_dir_ 290 ASSERT_TRUE(LoadExtension(test_data_dir_
292 .AppendASCII("extension_resource_request_policy") 291 .AppendASCII("extension_resource_request_policy")
293 .AppendASCII("web_accessible"))); 292 .AppendASCII("web_accessible")));
294 293
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 371
373 content::WebContents* web_contents = 372 content::WebContents* web_contents =
374 browser()->tab_strip_model()->GetActiveWebContents(); 373 browser()->tab_strip_model()->GetActiveWebContents();
375 374
376 GURL private_page( 375 GURL private_page(
377 "chrome-extension://kegmjfcnjamahdnldjmlpachmpielcdk/private.html"); 376 "chrome-extension://kegmjfcnjamahdnldjmlpachmpielcdk/private.html");
378 NavigationErrorObserver observer(web_contents, private_page); 377 NavigationErrorObserver observer(web_contents, private_page);
379 ASSERT_TRUE(content::ExecuteScript(web_contents, "navigateFrameNow()")); 378 ASSERT_TRUE(content::ExecuteScript(web_contents, "navigateFrameNow()"));
380 observer.Wait(); 379 observer.Wait();
381 } 380 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698