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

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 337213004: Re-enable PlatformAppBrowserTest.Messaging (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/api/app_runtime.h" 7 #include "apps/common/api/app_runtime.h"
8 #include "apps/launcher.h" 8 #include "apps/launcher.h"
9 #include "apps/ui/native_app_window.h" 9 #include "apps/ui/native_app_window.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 app_loaded_observer.Wait(); 1034 app_loaded_observer.Wait();
1035 ASSERT_TRUE(should_install.seen()); 1035 ASSERT_TRUE(should_install.seen());
1036 1036
1037 ExtensionTestMessageListener launched_listener("Launched", false); 1037 ExtensionTestMessageListener launched_listener("Launched", false);
1038 OpenApplication(AppLaunchParams( 1038 OpenApplication(AppLaunchParams(
1039 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW)); 1039 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
1040 1040
1041 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); 1041 ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
1042 } 1042 }
1043 1043
1044 // Flakes on Windows: http://crbug.com/171450 1044 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, Messaging) {
1045 #if defined(OS_WIN)
1046 #define MAYBE_Messaging DISABLED_Messaging
1047 #else
1048 #define MAYBE_Messaging Messaging
1049 #endif
1050 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Messaging) {
1051 ExtensionApiTest::ResultCatcher result_catcher; 1045 ExtensionApiTest::ResultCatcher result_catcher;
1052 LoadAndLaunchPlatformApp("messaging/app2", "Launched"); 1046 LoadAndLaunchPlatformApp("messaging/app2", "Launched");
1053 LoadAndLaunchPlatformApp("messaging/app1", "Launched"); 1047 LoadAndLaunchPlatformApp("messaging/app1", "Launched");
1054 EXPECT_TRUE(result_catcher.GetNextResult()); 1048 EXPECT_TRUE(result_catcher.GetNextResult());
1055 } 1049 }
1056 1050
1057 // TODO(linux_aura) http://crbug.com/163931 1051 // TODO(linux_aura) http://crbug.com/163931
1058 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) 1052 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
1059 #define MAYBE_WebContentsHasFocus DISABLED_WebContentsHasFocus 1053 #define MAYBE_WebContentsHasFocus DISABLED_WebContentsHasFocus
1060 #else 1054 #else
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); 1274 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
1281 ASSERT_TRUE(extension); 1275 ASSERT_TRUE(extension);
1282 ASSERT_EQ(extension_id, extension->id()); 1276 ASSERT_EQ(extension_id, extension->id());
1283 1277
1284 ExtensionApiTest::ResultCatcher result_catcher; 1278 ExtensionApiTest::ResultCatcher result_catcher;
1285 EXPECT_TRUE(result_catcher.GetNextResult()); 1279 EXPECT_TRUE(result_catcher.GetNextResult());
1286 } 1280 }
1287 } 1281 }
1288 1282
1289 } // namespace extensions 1283 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698