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

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

Issue 20593003: Move kEnableExperimentalExtensionApis switch to extensions/common/switches.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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
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/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/automation/automation_util.h" 7 #include "chrome/browser/automation/automation_util.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_host.h" 9 #include "chrome/browser/extensions/extension_host.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
17 #include "chrome/test/base/ui_test_utils.h" 16 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/render_process_host.h" 17 #include "content/public/browser/render_process_host.h"
19 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
20 #include "content/public/browser/site_instance.h" 19 #include "content/public/browser/site_instance.h"
21 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
22 #include "content/public/test/browser_test_utils.h" 21 #include "content/public/test/browser_test_utils.h"
22 #include "extensions/common/switches.h"
23 #include "net/dns/mock_host_resolver.h" 23 #include "net/dns/mock_host_resolver.h"
24 #include "net/test/embedded_test_server/embedded_test_server.h" 24 #include "net/test/embedded_test_server/embedded_test_server.h"
25 #include "net/test/embedded_test_server/http_response.h" 25 #include "net/test/embedded_test_server/http_response.h"
26 #include "net/test/embedded_test_server/http_request.h" 26 #include "net/test/embedded_test_server/http_request.h"
27 27
28 using content::ExecuteScript; 28 using content::ExecuteScript;
29 using content::ExecuteScriptAndExtractString; 29 using content::ExecuteScriptAndExtractString;
30 using content::NavigationController; 30 using content::NavigationController;
31 using content::WebContents; 31 using content::WebContents;
32 using content::RenderViewHost; 32 using content::RenderViewHost;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 if (installed_app && installed_app->is_app()) 122 if (installed_app && installed_app->is_app())
123 return installed_app; 123 return installed_app;
124 } 124 }
125 } 125 }
126 return NULL; 126 return NULL;
127 } 127 }
128 128
129 private: 129 private:
130 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 130 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
131 ExtensionBrowserTest::SetUpCommandLine(command_line); 131 ExtensionBrowserTest::SetUpCommandLine(command_line);
132 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 132 command_line->AppendSwitch(
133 extensions::switches::kEnableExperimentalExtensionApis);
133 } 134 }
134 }; 135 };
135 136
136 } // namespace 137 } // namespace
137 138
138 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { 139 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) {
139 host_resolver()->AddRule("*", "127.0.0.1"); 140 host_resolver()->AddRule("*", "127.0.0.1");
140 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 141 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
141 142
142 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); 143 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 EXPECT_EQ("ss_app2", result); 581 EXPECT_EQ("ss_app2", result);
581 582
582 ui_test_utils::NavigateToURLWithDisposition( 583 ui_test_utils::NavigateToURLWithDisposition(
583 browser(), base_url.Resolve("non_app/main.html"), 584 browser(), base_url.Resolve("non_app/main.html"),
584 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 585 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
585 ASSERT_TRUE(ExecuteScriptAndExtractString( 586 ASSERT_TRUE(ExecuteScriptAndExtractString(
586 browser()->tab_strip_model()->GetWebContentsAt(0), 587 browser()->tab_strip_model()->GetWebContentsAt(0),
587 kRetrieveSessionStorage.c_str(), &result)); 588 kRetrieveSessionStorage.c_str(), &result));
588 EXPECT_EQ("ss_normal", result); 589 EXPECT_EQ("ss_normal", result);
589 } 590 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698