| 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 "base/stringprintf.h" | 5 #include "base/stringprintf.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/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" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 iter != extension_ids.end(); ++iter) { | 59 iter != extension_ids.end(); ++iter) { |
| 60 installed_app = service->extensions()->GetByID(*iter); | 60 installed_app = service->extensions()->GetByID(*iter); |
| 61 if (installed_app && installed_app->is_app()) | 61 if (installed_app && installed_app->is_app()) |
| 62 return installed_app; | 62 return installed_app; |
| 63 } | 63 } |
| 64 } | 64 } |
| 65 return NULL; | 65 return NULL; |
| 66 } | 66 } |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 virtual void SetUpCommandLine(CommandLine* command_line) { | 69 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 70 ExtensionBrowserTest::SetUpCommandLine(command_line); | 70 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 71 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 71 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
| 72 } | 72 } |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 } // namespace | 75 } // namespace |
| 76 | 76 |
| 77 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { | 77 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { |
| 78 host_resolver()->AddRule("*", "127.0.0.1"); | 78 host_resolver()->AddRule("*", "127.0.0.1"); |
| 79 ASSERT_TRUE(test_server()->Start()); | 79 ASSERT_TRUE(test_server()->Start()); |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 EXPECT_EQ("ss_app2", result); | 500 EXPECT_EQ("ss_app2", result); |
| 501 | 501 |
| 502 ui_test_utils::NavigateToURLWithDisposition( | 502 ui_test_utils::NavigateToURLWithDisposition( |
| 503 browser(), base_url.Resolve("non_app/main.html"), | 503 browser(), base_url.Resolve("non_app/main.html"), |
| 504 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 504 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
| 505 ASSERT_TRUE(ExecuteScriptAndExtractString( | 505 ASSERT_TRUE(ExecuteScriptAndExtractString( |
| 506 browser()->tab_strip_model()->GetWebContentsAt(0), | 506 browser()->tab_strip_model()->GetWebContentsAt(0), |
| 507 kRetrieveSessionStorage.c_str(), &result)); | 507 kRetrieveSessionStorage.c_str(), &result)); |
| 508 EXPECT_EQ("ss_normal", result); | 508 EXPECT_EQ("ss_normal", result); |
| 509 } | 509 } |
| OLD | NEW |