| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 // Tests for the --load-and-launch-app switch. | 5 // Tests for the --load-and-launch-app switch. |
| 6 // The two cases are when chrome is running and another process uses the switch | 6 // The two cases are when chrome is running and another process uses the switch |
| 7 // and when chrome is started from scratch. | 7 // and when chrome is started from scratch. |
| 8 | 8 |
| 9 #include "apps/switches.h" | 9 #include "apps/switches.h" |
| 10 #include "base/process/launch.h" | 10 #include "base/process/launch.h" |
| 11 #include "base/test/test_timeouts.h" | 11 #include "base/test/test_timeouts.h" |
| 12 #include "chrome/browser/apps/app_browsertest_util.h" | 12 #include "chrome/browser/apps/app_browsertest_util.h" |
| 13 #include "chrome/browser/extensions/extension_browsertest.h" | 13 #include "chrome/browser/extensions/extension_browsertest.h" |
| 14 #include "chrome/browser/extensions/extension_test_message_listener.h" | |
| 15 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
| 16 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 17 #include "content/public/test/test_launcher.h" | 16 #include "content/public/test/test_launcher.h" |
| 17 #include "extensions/test/extension_test_message_listener.h" |
| 18 | 18 |
| 19 using extensions::PlatformAppBrowserTest; | 19 using extensions::PlatformAppBrowserTest; |
| 20 | 20 |
| 21 namespace apps { | 21 namespace apps { |
| 22 | 22 |
| 23 // TODO(jackhou): Enable this test once it works on OSX. It currently does not | 23 // TODO(jackhou): Enable this test once it works on OSX. It currently does not |
| 24 // work for the same reason --app-id doesn't. See http://crbug.com/148465 | 24 // work for the same reason --app-id doesn't. See http://crbug.com/148465 |
| 25 #if defined(OS_MACOSX) | 25 #if defined(OS_MACOSX) |
| 26 #define MAYBE_LoadAndLaunchAppChromeRunning \ | 26 #define MAYBE_LoadAndLaunchAppChromeRunning \ |
| 27 DISABLED_LoadAndLaunchAppChromeRunning | 27 DISABLED_LoadAndLaunchAppChromeRunning |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 LoadAndLaunchAppChromeNotRunning | 146 LoadAndLaunchAppChromeNotRunning |
| 147 #endif | 147 #endif |
| 148 | 148 |
| 149 // Case where Chrome is not running. | 149 // Case where Chrome is not running. |
| 150 IN_PROC_BROWSER_TEST_F(PlatformAppLoadAndLaunchBrowserTest, | 150 IN_PROC_BROWSER_TEST_F(PlatformAppLoadAndLaunchBrowserTest, |
| 151 MAYBE_LoadAndLaunchAppChromeNotRunning) { | 151 MAYBE_LoadAndLaunchAppChromeNotRunning) { |
| 152 LoadAndLaunchApp(); | 152 LoadAndLaunchApp(); |
| 153 } | 153 } |
| 154 | 154 |
| 155 } // namespace apps | 155 } // namespace apps |
| OLD | NEW |