diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 23:06:55 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 23:06:55 +0000 |
| commit | 0a405b3a6205d387e0dd43a59624e7c81f0a8d3b (patch) | |
| tree | 2ef7c43dd5e65cf973bc8e9766ad69c2be8a0191 /chrome | |
| parent | ce036773b836e5b2bcdf9eb50decb49e41f691fa (diff) | |
| download | chromium_src-0a405b3a6205d387e0dd43a59624e7c81f0a8d3b.zip chromium_src-0a405b3a6205d387e0dd43a59624e7c81f0a8d3b.tar.gz chromium_src-0a405b3a6205d387e0dd43a59624e7c81f0a8d3b.tar.bz2 | |
Modify the incognito content script test to verify that a crash no longer
occurs with multiple extensions installed with varying incognito enabledness.
See r38933 for the actual fix.
Review URL: http://codereview.chromium.org/596101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/browser/extensions/incognito_noscript_apitest.cc | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/chrome/browser/extensions/incognito_noscript_apitest.cc b/chrome/browser/extensions/incognito_noscript_apitest.cc index 1a63d88..ebd4910 100755 --- a/chrome/browser/extensions/incognito_noscript_apitest.cc +++ b/chrome/browser/extensions/incognito_noscript_apitest.cc @@ -23,9 +23,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) { // that loads to "modified". CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - FilePath extension_path = test_data_dir_.AppendASCII("api_test") - .AppendASCII("incognito_no_script"); - ASSERT_TRUE(LoadExtension(extension_path)); + ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") + .AppendASCII("incognito_no_script"))); // Open incognito window and navigate to test page. ui_test_utils::OpenURLOffTheRecord(browser()->profile(), @@ -42,21 +41,30 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoYesScript) { host_resolver()->AddRule("*", "127.0.0.1"); StartHTTPServer(); + // Load a dummy extension. This just tests that we don't regress a + // crash fix when multiple incognito- and non-incognito-enabled extensions + // are mixed. + ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") + .AppendASCII("content_scripts").AppendASCII("all_frames"))); + // Loads a simple extension which attempts to change the title of every page // that loads to "modified". CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - FilePath extension_path = test_data_dir_.AppendASCII("api_test") - .AppendASCII("incognito_no_script"); - ASSERT_TRUE(LoadExtension(extension_path)); + ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") + .AppendASCII("incognito_no_script"))); + + // Dummy extension #2. + ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") + .AppendASCII("content_scripts").AppendASCII("isolated_world1"))); - // Now enable the extension in incognito mode, and ensure that page titles - // are modified. + // Now enable the incognito_no_script extension in incognito mode, and ensure + // that page titles are modified. ExtensionsService* service = browser()->profile()->GetExtensionsService(); service->extension_prefs()->SetIsIncognitoEnabled( - service->extensions()->at(0)->id(), true); + service->extensions()->at(1)->id(), true); browser()->profile()->GetUserScriptMaster()->ReloadExtensionForTesting( - service->extensions()->at(0)); + service->extensions()->at(1)); // Open incognito window and navigate to test page. ui_test_utils::OpenURLOffTheRecord(browser()->profile(), |