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

Side by Side Diff: extensions/browser/api/app_window/app_window_apitest.cc

Issue 2855563002: Revert of Disable flaky ExperimentalAppWindowApiTest.SetIcon (Closed)
Patch Set: Created 3 years, 7 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
« 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/apps/app_browsertest_util.h" 10 #include "chrome/browser/apps/app_browsertest_util.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver); 56 DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver);
57 }; 57 };
58 58
59 } // namespace 59 } // namespace
60 60
61 using AppWindowApiTest = PlatformAppBrowserTest; 61 using AppWindowApiTest = PlatformAppBrowserTest;
62 using ExperimentalAppWindowApiTest = ExperimentalPlatformAppBrowserTest; 62 using ExperimentalAppWindowApiTest = ExperimentalPlatformAppBrowserTest;
63 63
64 // Tests chrome.app.window.setIcon. 64 // Tests chrome.app.window.setIcon.
65 // Flaky test crbug.com/716726 65 IN_PROC_BROWSER_TEST_F(ExperimentalAppWindowApiTest, SetIcon) {
66 IN_PROC_BROWSER_TEST_F(ExperimentalAppWindowApiTest, DISABLED_SetIcon) {
67 std::unique_ptr<TestAppWindowRegistryObserver> test_observer( 66 std::unique_ptr<TestAppWindowRegistryObserver> test_observer(
68 new TestAppWindowRegistryObserver(browser()->profile())); 67 new TestAppWindowRegistryObserver(browser()->profile()));
69 ExtensionTestMessageListener listener("ready", true); 68 ExtensionTestMessageListener listener("ready", true);
70 69
71 // Launch the app and wait for it to be ready. 70 // Launch the app and wait for it to be ready.
72 LoadAndLaunchPlatformApp("windows_api_set_icon", &listener); 71 LoadAndLaunchPlatformApp("windows_api_set_icon", &listener);
73 EXPECT_EQ(0, test_observer->icon_updates()); 72 EXPECT_EQ(0, test_observer->icon_updates());
74 listener.Reply(""); 73 listener.Reply("");
75 74
76 // Now wait until the WebContent has decoded the icon and chrome has 75 // Now wait until the WebContent has decoded the icon and chrome has
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 command_line->AppendSwitchASCII(switches::kAppId, 215 command_line->AppendSwitchASCII(switches::kAppId,
217 "jkghodnilhceideoidjikpgommlajknk"); 216 "jkghodnilhceideoidjikpgommlajknk");
218 217
219 EXPECT_TRUE(RunComponentExtensionTest( 218 EXPECT_TRUE(RunComponentExtensionTest(
220 "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen")) 219 "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen"))
221 << message_; 220 << message_;
222 } 221 }
223 #endif // OS_CHROMEOS 222 #endif // OS_CHROMEOS
224 223
225 } // namespace extensions 224 } // 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