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

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

Issue 1545973002: Remove the is_loading_ field from WebContentsImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation error on windows Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/task_management/providers/web_contents/subframe_task_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 "window.domAutomationController.send(document.title)", 220 "window.domAutomationController.send(document.title)",
221 &result)); 221 &result));
222 EXPECT_EQ("Loading CER:// failed.", result); 222 EXPECT_EQ("Loading CER:// failed.", result);
223 223
224 GURL newtab_page("chrome://newtab"); 224 GURL newtab_page("chrome://newtab");
225 GURL accessible_newtab_override(embedded_test_server()->GetURL( 225 GURL accessible_newtab_override(embedded_test_server()->GetURL(
226 "/extensions/api_test/extension_resource_request_policy/" 226 "/extensions/api_test/extension_resource_request_policy/"
227 "web_accessible/accessible_history_navigation.html")); 227 "web_accessible/accessible_history_navigation.html"));
228 ui_test_utils::NavigateToURL(browser(), newtab_page); 228 ui_test_utils::NavigateToURL(browser(), newtab_page);
229 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( 229 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
230 browser(), accessible_newtab_override, 2); 230 browser(), accessible_newtab_override, 1);
Ken Rockot(use gerrit already) 2016/01/28 21:27:49 I'm curious why these had to change from 2 to 1?
clamy 2016/01/29 10:44:55 Before the CL, there was a case where starting a n
231 ASSERT_TRUE(content::ExecuteScriptAndExtractString( 231 ASSERT_TRUE(content::ExecuteScriptAndExtractString(
232 browser()->tab_strip_model()->GetActiveWebContents(), 232 browser()->tab_strip_model()->GetActiveWebContents(),
233 "window.domAutomationController.send(document.title)", 233 "window.domAutomationController.send(document.title)",
234 &result)); 234 &result));
235 EXPECT_EQ("New Tab Page Loaded Successfully", result); 235 EXPECT_EQ("New Tab Page Loaded Successfully", result);
236 } 236 }
237 237
238 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 238 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
239 LinkToWebAccessibleResources) { 239 LinkToWebAccessibleResources) {
240 std::string result; 240 std::string result;
241 ASSERT_TRUE(embedded_test_server()->Start()); 241 ASSERT_TRUE(embedded_test_server()->Start());
242 ASSERT_TRUE(LoadExtension(test_data_dir_ 242 ASSERT_TRUE(LoadExtension(test_data_dir_
243 .AppendASCII("extension_resource_request_policy") 243 .AppendASCII("extension_resource_request_policy")
244 .AppendASCII("web_accessible"))); 244 .AppendASCII("web_accessible")));
245 245
246 GURL accessible_linked_resource(embedded_test_server()->GetURL( 246 GURL accessible_linked_resource(embedded_test_server()->GetURL(
247 "/extensions/api_test/extension_resource_request_policy/" 247 "/extensions/api_test/extension_resource_request_policy/"
248 "web_accessible/accessible_link_resource.html")); 248 "web_accessible/accessible_link_resource.html"));
249 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), 249 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
250 accessible_linked_resource, 2); 250 browser(), accessible_linked_resource, 1);
251 ASSERT_TRUE(content::ExecuteScriptAndExtractString( 251 ASSERT_TRUE(content::ExecuteScriptAndExtractString(
252 browser()->tab_strip_model()->GetActiveWebContents(), 252 browser()->tab_strip_model()->GetActiveWebContents(),
253 "window.domAutomationController.send(document.URL)", 253 "window.domAutomationController.send(document.URL)",
254 &result)); 254 &result));
255 EXPECT_NE("about:blank", result); 255 EXPECT_NE("about:blank", result);
256 256
257 GURL nonaccessible_linked_resource(embedded_test_server()->GetURL( 257 GURL nonaccessible_linked_resource(embedded_test_server()->GetURL(
258 "/extensions/api_test/extension_resource_request_policy/" 258 "/extensions/api_test/extension_resource_request_policy/"
259 "web_accessible/nonaccessible_link_resource.html")); 259 "web_accessible/nonaccessible_link_resource.html"));
260 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), 260 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 #if defined(OS_MACOSX) 321 #if defined(OS_MACOSX)
322 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources 322 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources
323 #else 323 #else
324 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources 324 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources
325 #endif 325 #endif
326 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 326 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
327 MAYBE_ExtensionAccessibleResources) { 327 MAYBE_ExtensionAccessibleResources) {
328 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; 328 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_;
329 } 329 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/task_management/providers/web_contents/subframe_task_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698