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

Side by Side Diff: chrome/browser/extensions/extension_fullscreen_apitest.cc

Issue 288083002: linux_aura: Reenable a bunch of tests that were disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert the BookmarkBarView test enabling; those are still failing. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/ui/browser_window.h" 6 #include "chrome/browser/ui/browser_window.h"
7 #include "chrome/test/base/ui_test_utils.h" 7 #include "chrome/test/base/ui_test_utils.h"
8 8
9 // Window resizes are not completed by the time the callback happens,
10 // so these tests fail on linux/gtk. http://crbug.com/72369
11 #if defined(OS_LINUX) && !defined(USE_AURA)
12 #define MAYBE_FocusWindowDoesNotExitFullscreen \
13 DISABLED_FocusWindowDoesNotExitFullscreen
14 #define MAYBE_UpdateWindowSizeExitsFullscreen \
15 DISABLED_UpdateWindowSizeExitsFullscreen
16 #else
17
18 // TODO(linux_aura) http://crbug.com/163931
19 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
20 #define MAYBE_FocusWindowDoesNotExitFullscreen \
21 DISABLED_FocusWindowDoesNotExitFullscreen
22 #else
23 #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen
24 #endif
25
26 // Fails flakily: http://crbug.com/308041
27 #define MAYBE_UpdateWindowSizeExitsFullscreen DISABLED_UpdateWindowSizeExitsFull screen
28 #endif // defined(OS_LINUX) && !defined(USE_AURA)
29
30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 9 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
31 ExtensionFullscreenAccessFail) { 10 ExtensionFullscreenAccessFail) {
32 // Test that fullscreen can be accessed from an extension without permission. 11 // Test that fullscreen can be accessed from an extension without permission.
33 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_; 12 ASSERT_TRUE(RunPlatformAppTest("fullscreen/no_permission")) << message_;
34 } 13 }
35 14
36 // Disabled, a user gesture is required for fullscreen. http://crbug.com/174178 15 // Disabled, a user gesture is required for fullscreen. http://crbug.com/174178
37 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
38 DISABLED_ExtensionFullscreenAccessPass) { 17 DISABLED_ExtensionFullscreenAccessPass) {
39 // Test that fullscreen can be accessed from an extension with permission. 18 // Test that fullscreen can be accessed from an extension with permission.
40 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; 19 ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_;
41 } 20 }
42 21
43 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
44 MAYBE_FocusWindowDoesNotExitFullscreen) { 23 FocusWindowDoesNotExitFullscreen) {
45 browser()->window()->EnterFullscreen( 24 browser()->window()->EnterFullscreen(
46 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); 25 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
47 bool is_fullscreen = browser()->window()->IsFullscreen(); 26 bool is_fullscreen = browser()->window()->IsFullscreen();
48 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; 27 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_;
49 ASSERT_EQ(is_fullscreen, browser()->window()->IsFullscreen()); 28 ASSERT_EQ(is_fullscreen, browser()->window()->IsFullscreen());
50 } 29 }
51 30
31 // Fails flakily: http://crbug.com/308041
52 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 32 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
53 MAYBE_UpdateWindowSizeExitsFullscreen) { 33 DISABLED_UpdateWindowSizeExitsFullscreen) {
54 browser()->window()->EnterFullscreen( 34 browser()->window()->EnterFullscreen(
55 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); 35 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
56 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; 36 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_;
57 ASSERT_FALSE(browser()->window()->IsFullscreen()); 37 ASSERT_FALSE(browser()->window()->IsFullscreen());
58 } 38 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698