Commit 6928d8a7 authored by abarth@chromium.org's avatar abarth@chromium.org

Mark WebNavigation tests as using legacy extension manifests.

We could convert these tests to use manifest_version 2, but it's not worth the
effort.  (After this patch, I believe all the tests will pass when we require
manifest_version 2 for unpacked extensions.)

BUG=62897
Review URL: http://codereview.chromium.org/8864002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113520 0039d316-1c4b-4281-b951-d872f2087c98
parent 05b71a06
......@@ -42,6 +42,9 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigation) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_api.html")) << message_;
}
......@@ -49,6 +52,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigation) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationGetFrame) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_getFrame.html")) << message_;
}
......@@ -56,6 +62,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationGetFrame) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationClientRedirect) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_clientRedirect.html"))
<< message_;
......@@ -66,6 +75,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationServerRedirect) {
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(StartTestServer());
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_serverRedirect.html"))
<< message_;
......@@ -74,6 +86,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationServerRedirect) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationForwardBack) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_forwardBack.html"))
<< message_;
......@@ -82,6 +97,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationForwardBack) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationIFrame) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_iframe.html")) << message_;
}
......@@ -89,6 +107,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationIFrame) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationOpenTab) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_openTab.html")) << message_;
}
......@@ -96,6 +117,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationOpenTab) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationReferenceFragment) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_referenceFragment.html"))
<< message_;
......@@ -104,6 +128,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationReferenceFragment) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationSimpleLoad) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_simpleLoad.html")) << message_;
}
......@@ -111,6 +138,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationSimpleLoad) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_failures.html")) << message_;
}
......@@ -118,6 +148,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
// Wait for the extension to set itself up and return control to us.
ASSERT_TRUE(
RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_;
......@@ -154,6 +187,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationRequestOpenTab) {
FrameNavigationState::set_allow_extension_scheme(true);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowLegacyExtensionManifests);
// Wait for the extension to set itself up and return control to us.
ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html"))
<< message_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment