diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 03:21:13 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 03:21:13 +0000 |
| commit | 5f8681f6e104c322166e4bb860e242a86a601e13 (patch) | |
| tree | d8e1516961fc938178e46ebdc2df9e7d5458a67c /chrome/browser/extensions/extension_startup_unittest.cc | |
| parent | a3d46f7e58274fc65cb89628a8e89fc49bca2750 (diff) | |
| download | chromium_src-5f8681f6e104c322166e4bb860e242a86a601e13.zip chromium_src-5f8681f6e104c322166e4bb860e242a86a601e13.tar.gz chromium_src-5f8681f6e104c322166e4bb860e242a86a601e13.tar.bz2 | |
Don't allow content scripts to execute on file:// urls.
This requires a command line flag for the page cycler tests,
since those load file:// urls.
BUG=27877
TEST=Bunch of tests affected.
Review URL: http://codereview.chromium.org/402029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_startup_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_startup_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_startup_unittest.cc b/chrome/browser/extensions/extension_startup_unittest.cc index 00089ae..f076b37 100644 --- a/chrome/browser/extensions/extension_startup_unittest.cc +++ b/chrome/browser/extensions/extension_startup_unittest.cc @@ -131,12 +131,9 @@ class ExtensionStartupTestBase void TestInjection(bool expect_css, bool expect_script) { // Load a page affected by the content script and test to see the effect. - FilePath test_file; - PathService::Get(chrome::DIR_TEST_DATA, &test_file); - test_file = test_file.AppendASCII("extensions") - .AppendASCII("test_file.html"); - - ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file)); + HTTPTestServer* server = StartHTTPServer(); + GURL url = server->TestServerPage("file/extensions/test_file.html"); + ui_test_utils::NavigateToURL(browser(), url); bool result = false; ui_test_utils::ExecuteJavaScriptAndExtractBool( |