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

Unified Diff: chrome/browser/extensions/api/app_window/app_window_apitest.cc

Issue 411253002: Fix flaky WindowsApiSetIcon test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/data/extensions/platform_apps/windows_api_set_icon/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/app_window/app_window_apitest.cc
diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
index 5b20a4226b85d87f31c8734628324d0d1f95ba6e..2420628ad7a3ddee05b023b3ca3da34554dea3d7 100644
--- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
@@ -51,8 +51,13 @@ namespace extensions {
IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) {
scoped_ptr<TestAppWindowRegistryObserver> test_observer(
new TestAppWindowRegistryObserver(browser()->profile()));
- LoadAndLaunchPlatformApp("windows_api_set_icon", "IconSet");
+ ExtensionTestMessageListener listener("ready", true);
+
+ // Launch the app and wait for it to be ready.
+ LoadAndLaunchPlatformApp("windows_api_set_icon", &listener);
EXPECT_EQ(0, test_observer->icon_updates());
+ listener.Reply("");
+
// Now wait until the WebContent has decoded the icon and chrome has
// processed it. This needs to be in a loop since the renderer runs in a
// different process.
« no previous file with comments | « no previous file | chrome/test/data/extensions/platform_apps/windows_api_set_icon/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698