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

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

Issue 490293002: Disable AppWindowInteractiveTest.ESCLeavesFullscreenDOM and AppWindowInteractiveTest.ESCDoesNotLeav… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 "chrome/browser/apps/app_browsertest_util.h" 5 #include "chrome/browser/apps/app_browsertest_util.h"
6 #include "chrome/browser/extensions/extension_test_message_listener.h" 6 #include "chrome/browser/extensions/extension_test_message_listener.h"
7 #include "chrome/test/base/interactive_test_utils.h" 7 #include "chrome/test/base/interactive_test_utils.h"
8 #include "extensions/browser/app_window/native_app_window.h" 8 #include "extensions/browser/app_window/native_app_window.h"
9 9
10 #if defined(OS_MACOSX) && !defined(OS_IOS) 10 #if defined(OS_MACOSX) && !defined(OS_IOS)
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // left when ESC is received. 119 // left when ESC is received.
120 { 120 {
121 FullscreenChangeWaiter fs_changed(GetFirstAppWindow()->GetBaseWindow()); 121 FullscreenChangeWaiter fs_changed(GetFirstAppWindow()->GetBaseWindow());
122 122
123 ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE)); 123 ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE));
124 124
125 fs_changed.Wait(); 125 fs_changed.Wait();
126 } 126 }
127 } 127 }
128 128
129 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenDOM) { 129 #if defined(OS_MACOSX)
130 // http://crbug.com/406009
131 #define MAYBE_ESCLeavesFullscreenDOM DISABLED_ESCLeavesFullscreenDOM
132 #else
133 #define MAYBE_ESCLeavesFullscreenDOM ESCLeavesFullscreenDOM
134 #endif
135 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_ESCLeavesFullscreenDOM) {
130 // This test is flaky on MacOS 10.6. 136 // This test is flaky on MacOS 10.6.
131 #if defined(OS_MACOSX) && !defined(OS_IOS) 137 #if defined(OS_MACOSX) && !defined(OS_IOS)
132 if (base::mac::IsOSSnowLeopard()) 138 if (base::mac::IsOSSnowLeopard())
133 return; 139 return;
134 #endif 140 #endif
135 141
136 ExtensionTestMessageListener launched_listener("Launched", true); 142 ExtensionTestMessageListener launched_listener("Launched", true);
137 LoadAndLaunchPlatformApp("leave_fullscreen", &launched_listener); 143 LoadAndLaunchPlatformApp("leave_fullscreen", &launched_listener);
138 144
139 // We start by making sure the window is actually focused. 145 // We start by making sure the window is actually focused.
(...skipping 29 matching lines...) Expand all
169 // left when ESC is received. 175 // left when ESC is received.
170 { 176 {
171 FullscreenChangeWaiter fs_changed(GetFirstAppWindow()->GetBaseWindow()); 177 FullscreenChangeWaiter fs_changed(GetFirstAppWindow()->GetBaseWindow());
172 178
173 ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE)); 179 ASSERT_TRUE(SimulateKeyPress(ui::VKEY_ESCAPE));
174 180
175 fs_changed.Wait(); 181 fs_changed.Wait();
176 } 182 }
177 } 183 }
178 184
185 #if defined(OS_MACOSX)
186 // http://crbug.com/406009
187 #define MAYBE_ESCDoesNotLeaveFullscreenWindow DISABLED_ESCDoesNotLeaveFullscreen Window
188 #else
189 #define MAYBE_ESCDoesNotLeaveFullscreenWindow ESCDoesNotLeaveFullscreenWindow
190 #endif
179 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, 191 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
180 ESCDoesNotLeaveFullscreenWindow) { 192 MAYBE_ESCDoesNotLeaveFullscreenWindow) {
181 // This test is flaky on MacOS 10.6. 193 // This test is flaky on MacOS 10.6.
182 #if defined(OS_MACOSX) && !defined(OS_IOS) 194 #if defined(OS_MACOSX) && !defined(OS_IOS)
183 if (base::mac::IsOSSnowLeopard()) 195 if (base::mac::IsOSSnowLeopard())
184 return; 196 return;
185 #endif 197 #endif
186 198
187 ExtensionTestMessageListener launched_listener("Launched", true); 199 ExtensionTestMessageListener launched_listener("Launched", true);
188 LoadAndLaunchPlatformApp("prevent_leave_fullscreen", &launched_listener); 200 LoadAndLaunchPlatformApp("prevent_leave_fullscreen", &launched_listener);
189 201
190 // We start by making sure the window is actually focused. 202 // We start by making sure the window is actually focused.
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; 448 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_;
437 } 449 }
438 450
439 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { 451 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) {
440 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; 452 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_;
441 } 453 }
442 454
443 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, TestDrawAttention) { 455 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, TestDrawAttention) {
444 ASSERT_TRUE(RunAppWindowInteractiveTest("testDrawAttention")) << message_; 456 ASSERT_TRUE(RunAppWindowInteractiveTest("testDrawAttention")) << message_;
445 } 457 }
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