diff options
author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 09:41:27 +0000 |
---|---|---|
committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 09:41:27 +0000 |
commit | 599f982a262960408e6a6485be64156dfd0b3240 (patch) | |
tree | a1d740a5cf667adce65ee5a7faebbb46188e48aa /chrome/browser/extensions/api/app_window/app_window_apitest.cc | |
parent | ffc5f68f914366f3d4b4c0d109d35bb03da3b05c (diff) | |
download | chromium_src-599f982a262960408e6a6485be64156dfd0b3240.zip chromium_src-599f982a262960408e6a6485be64156dfd0b3240.tar.gz chromium_src-599f982a262960408e6a6485be64156dfd0b3240.tar.bz2 |
Make LoadAndLaunchPlatformApp harder to make flaky tests with.
LoadAndLaunchPlatformApp will send a launched event to the app it is
launching, which will often end up with windows being opened. If the
test does not wait for the window to stop opening, the test will be
flaky.
This change updates LoadAndLaunchPlatformApp to wait for a signal to
come back from the app after it is launched before returning.
TBR=sky
BUG=383260
Review URL: https://codereview.chromium.org/324333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/app_window/app_window_apitest.cc')
-rw-r--r-- | chrome/browser/extensions/api/app_window/app_window_apitest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
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 8b581579..5b20a42 100644 --- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc +++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc @@ -51,11 +51,8 @@ namespace extensions { IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) { scoped_ptr<TestAppWindowRegistryObserver> test_observer( new TestAppWindowRegistryObserver(browser()->profile())); - ExtensionTestMessageListener listener("IconSet", false); - LoadAndLaunchPlatformApp("windows_api_set_icon"); + LoadAndLaunchPlatformApp("windows_api_set_icon", "IconSet"); EXPECT_EQ(0, test_observer->icon_updates()); - // Wait until the icon load has been requested. - ASSERT_TRUE(listener.WaitUntilSatisfied()); // 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. |