| OLD | NEW |
| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 return NULL; | 131 return NULL; |
| 132 } | 132 } |
| 133 | 133 |
| 134 private: | 134 private: |
| 135 void SetUpCommandLine(base::CommandLine* command_line) override { | 135 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 136 ExtensionBrowserTest::SetUpCommandLine(command_line); | 136 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 137 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 137 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
| 138 } | 138 } |
| 139 }; | 139 }; |
| 140 | 140 |
| 141 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { | 141 // flaky http://crbug.com/651844 |
| 142 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_CrossProcessClientRedirect) { |
| 142 host_resolver()->AddRule("*", "127.0.0.1"); | 143 host_resolver()->AddRule("*", "127.0.0.1"); |
| 143 ASSERT_TRUE(embedded_test_server()->Start()); | 144 ASSERT_TRUE(embedded_test_server()->Start()); |
| 144 | 145 |
| 145 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); | 146 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); |
| 146 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); | 147 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); |
| 147 | 148 |
| 148 GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/"); | 149 GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/"); |
| 149 GURL::Replacements replace_host; | 150 GURL::Replacements replace_host; |
| 150 replace_host.SetHostStr("localhost"); | 151 replace_host.SetHostStr("localhost"); |
| 151 base_url = base_url.ReplaceComponents(replace_host); | 152 base_url = base_url.ReplaceComponents(replace_host); |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 browser(), base_url.Resolve("non_app/main.html")); | 565 browser(), base_url.Resolve("non_app/main.html")); |
| 565 ASSERT_TRUE(ExecuteScriptAndExtractString( | 566 ASSERT_TRUE(ExecuteScriptAndExtractString( |
| 566 browser()->tab_strip_model()->GetWebContentsAt(0), | 567 browser()->tab_strip_model()->GetWebContentsAt(0), |
| 567 kRetrieveSessionStorage.c_str(), &result)); | 568 kRetrieveSessionStorage.c_str(), &result)); |
| 568 EXPECT_EQ("ss_normal", result); | 569 EXPECT_EQ("ss_normal", result); |
| 569 } | 570 } |
| 570 | 571 |
| 571 } // namespace | 572 } // namespace |
| 572 | 573 |
| 573 } // namespace extensions | 574 } // namespace extensions |
| OLD | NEW |