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

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc

Issue 10782027: Disable FullscreenControllerTest.TestNewTabExitsFullscreen on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 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 (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/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/content_settings/host_content_settings_map.h" 7 #include "chrome/browser/content_settings/host_content_settings_map.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
(...skipping 19 matching lines...) Expand all
30 } // namespace 30 } // namespace
31 31
32 class FullscreenControllerBrowserTest: public FullscreenControllerTest { 32 class FullscreenControllerBrowserTest: public FullscreenControllerTest {
33 protected: 33 protected:
34 void TestFullscreenMouseLockContentSettings(); 34 void TestFullscreenMouseLockContentSettings();
35 }; 35 };
36 36
37 #if defined(OS_MACOSX) 37 #if defined(OS_MACOSX)
38 // http://crbug.com/104265 38 // http://crbug.com/104265
39 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen 39 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen
40 #elif defined(OS_LINUX)
41 // http://crbug.com/137657
42 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen
40 #else 43 #else
41 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen 44 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen
42 #endif 45 #endif
43 46
44 // Tests that while in fullscreen creating a new tab will exit fullscreen. 47 // Tests that while in fullscreen creating a new tab will exit fullscreen.
45 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, 48 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
46 MAYBE_TestNewTabExitsFullscreen) { 49 MAYBE_TestNewTabExitsFullscreen) {
47 ASSERT_TRUE(test_server()->Start()); 50 ASSERT_TRUE(test_server()->Start());
48 51
49 AddTabAtIndexAndWait( 52 AddTabAtIndexAndWait(
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); 386 ASSERT_TRUE(IsFullscreenBubbleDisplayed());
384 387
385 // Close tab. Bubble is cleared. 388 // Close tab. Bubble is cleared.
386 { 389 {
387 MouseLockNotificationObserver mouse_lock_observer; 390 MouseLockNotificationObserver mouse_lock_observer;
388 chrome::CloseTab(browser()); 391 chrome::CloseTab(browser());
389 mouse_lock_observer.Wait(); 392 mouse_lock_observer.Wait();
390 } 393 }
391 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); 394 ASSERT_FALSE(IsFullscreenBubbleDisplayed());
392 } 395 }
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