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

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

Issue 10827107: Allow transitions to WebUI pages which are extension urls (new tab page is the relevant example). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.h » ('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/logging.h" 5 #include "base/logging.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 GURL nonaccessible_cer_resource( 199 GURL nonaccessible_cer_resource(
200 test_server()->GetURL( 200 test_server()->GetURL(
201 "files/extensions/api_test/extension_resource_request_policy/" 201 "files/extensions/api_test/extension_resource_request_policy/"
202 "web_accessible/nonaccessible_chrome_resource_scheme.html")); 202 "web_accessible/nonaccessible_chrome_resource_scheme.html"));
203 ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); 203 ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource);
204 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( 204 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
205 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", 205 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
206 L"window.domAutomationController.send(document.title)", 206 L"window.domAutomationController.send(document.title)",
207 &result)); 207 &result));
208 EXPECT_EQ("Loading CER:// failed.", result); 208 EXPECT_EQ("Loading CER:// failed.", result);
209
210 GURL newtab_page("chrome://newtab");
211 GURL accessible_newtab_override(
212 test_server()->GetURL(
213 "files/extensions/api_test/extension_resource_request_policy/"
214 "web_accessible/accessible_history_navigation.html"));
215 ui_test_utils::NavigateToURL(browser(), newtab_page);
216 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
217 browser(), accessible_newtab_override, 2);
218 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
219 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
220 L"window.domAutomationController.send(document.title)",
221 &result));
222 EXPECT_EQ("New Tab Page Loaded Successfully", result);
209 } 223 }
210 224
211 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 225 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
212 WebAccessibleResourcesWithCSP) { 226 WebAccessibleResourcesWithCSP) {
213 std::string result; 227 std::string result;
214 ASSERT_TRUE(test_server()->Start()); 228 ASSERT_TRUE(test_server()->Start());
215 ASSERT_TRUE(LoadExtension(test_data_dir_ 229 ASSERT_TRUE(LoadExtension(test_data_dir_
216 .AppendASCII("extension_resource_request_policy") 230 .AppendASCII("extension_resource_request_policy")
217 .AppendASCII("web_accessible"))); 231 .AppendASCII("web_accessible")));
218 232
(...skipping 22 matching lines...) Expand all
241 255
242 #if defined(OS_MACOSX) 256 #if defined(OS_MACOSX)
243 #define MAYBE_ExtensionAccessibleResources FLAKY_ExtensionAccessibleResources 257 #define MAYBE_ExtensionAccessibleResources FLAKY_ExtensionAccessibleResources
244 #else 258 #else
245 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources 259 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources
246 #endif 260 #endif
247 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 261 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
248 MAYBE_ExtensionAccessibleResources) { 262 MAYBE_ExtensionAccessibleResources) {
249 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; 263 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_;
250 } 264 }
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698