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 #include "apps/app_window.h" | 5 #include "apps/app_window.h" |
6 #include "apps/app_window_registry.h" | 6 #include "apps/app_window_registry.h" |
7 #include "apps/launcher.h" | 7 #include "apps/launcher.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1044 app_loaded_observer.Wait(); | 1044 app_loaded_observer.Wait(); |
1045 ASSERT_TRUE(should_install.seen()); | 1045 ASSERT_TRUE(should_install.seen()); |
1046 | 1046 |
1047 ExtensionTestMessageListener launched_listener("Launched", false); | 1047 ExtensionTestMessageListener launched_listener("Launched", false); |
1048 OpenApplication(AppLaunchParams( | 1048 OpenApplication(AppLaunchParams( |
1049 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW)); | 1049 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW)); |
1050 | 1050 |
1051 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); | 1051 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); |
1052 } | 1052 } |
1053 | 1053 |
| 1054 // Flaky: http://crbug.com/407409 |
1054 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 1055 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
1055 ComponentExtensionRuntimeReload) { | 1056 DISABLED_ComponentExtensionRuntimeReload) { |
1056 // Ensure that we wait until the background page is run (to register the | 1057 // Ensure that we wait until the background page is run (to register the |
1057 // OnLaunched listener) before trying to open the application. This is similar | 1058 // OnLaunched listener) before trying to open the application. This is similar |
1058 // to LoadAndLaunchPlatformApp, but we want to load as a component extension. | 1059 // to LoadAndLaunchPlatformApp, but we want to load as a component extension. |
1059 content::WindowedNotificationObserver app_loaded_observer( | 1060 content::WindowedNotificationObserver app_loaded_observer( |
1060 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, | 1061 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, |
1061 content::NotificationService::AllSources()); | 1062 content::NotificationService::AllSources()); |
1062 | 1063 |
1063 const Extension* extension = LoadExtensionAsComponent( | 1064 const Extension* extension = LoadExtensionAsComponent( |
1064 test_data_dir_.AppendASCII("platform_apps").AppendASCII("component")); | 1065 test_data_dir_.AppendASCII("platform_apps").AppendASCII("component")); |
1065 ASSERT_TRUE(extension); | 1066 ASSERT_TRUE(extension); |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1320 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); | 1321 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); |
1321 ASSERT_TRUE(extension); | 1322 ASSERT_TRUE(extension); |
1322 ASSERT_EQ(extension_id, extension->id()); | 1323 ASSERT_EQ(extension_id, extension->id()); |
1323 | 1324 |
1324 ExtensionApiTest::ResultCatcher result_catcher; | 1325 ExtensionApiTest::ResultCatcher result_catcher; |
1325 EXPECT_TRUE(result_catcher.GetNextResult()); | 1326 EXPECT_TRUE(result_catcher.GetNextResult()); |
1326 } | 1327 } |
1327 } | 1328 } |
1328 | 1329 |
1329 } // namespace extensions | 1330 } // namespace extensions |
OLD | NEW |