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

Side by Side Diff: ash/display/display_manager_unittest.cc

Issue 15659012: Disabled flaky DisplayManagerTest.Rotate on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 "ash/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/screen_ash.h" 8 #include "ash/screen_ash.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 EXPECT_EQ("400x400", 695 EXPECT_EQ("400x400",
696 GetDisplayInfoAt(1).size_in_pixel().ToString()); 696 GetDisplayInfoAt(1).size_in_pixel().ToString());
697 697
698 // Clearing the custom overscan should set the bounds to 698 // Clearing the custom overscan should set the bounds to
699 // original. 699 // original.
700 display_manager()->ClearCustomOverscanInsets(id); 700 display_manager()->ClearCustomOverscanInsets(id);
701 EXPECT_EQ("380x380", 701 EXPECT_EQ("380x380",
702 GetDisplayInfoAt(1).size_in_pixel().ToString()); 702 GetDisplayInfoAt(1).size_in_pixel().ToString());
703 } 703 }
704 704
705 TEST_F(DisplayManagerTest, Rotate) { 705 #if defined(OS_WIN)
706 // Flaky on Win8 Aura: http://crbug.com/244466
707 #define MAYBE_Rotate DISABLED_Rotate
708 #else
709 #define MAYBE_Rotate Rotate
710 #endif
711 TEST_F(DisplayManagerTest, MAYBE_Rotate) {
706 UpdateDisplay("100x200/r,300x400/l"); 712 UpdateDisplay("100x200/r,300x400/l");
707 EXPECT_EQ("1,1 100x200", 713 EXPECT_EQ("1,1 100x200",
708 GetDisplayInfoAt(0).bounds_in_pixel().ToString()); 714 GetDisplayInfoAt(0).bounds_in_pixel().ToString());
709 EXPECT_EQ("200x100", 715 EXPECT_EQ("200x100",
710 GetDisplayInfoAt(0).size_in_pixel().ToString()); 716 GetDisplayInfoAt(0).size_in_pixel().ToString());
711 717
712 EXPECT_EQ("1,201 300x400", 718 EXPECT_EQ("1,201 300x400",
713 GetDisplayInfoAt(1).bounds_in_pixel().ToString()); 719 GetDisplayInfoAt(1).bounds_in_pixel().ToString());
714 EXPECT_EQ("400x300", 720 EXPECT_EQ("400x300",
715 GetDisplayInfoAt(1).size_in_pixel().ToString()); 721 GetDisplayInfoAt(1).size_in_pixel().ToString());
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 EXPECT_TRUE(display_manager->IsMirrored()); 880 EXPECT_TRUE(display_manager->IsMirrored());
875 881
876 display_manager->SetMirrorMode(false); 882 display_manager->SetMirrorMode(false);
877 EXPECT_EQ(NULL, test_api.GetRootWindow()); 883 EXPECT_EQ(NULL, test_api.GetRootWindow());
878 EXPECT_EQ(2U, display_manager->GetNumDisplays()); 884 EXPECT_EQ(2U, display_manager->GetNumDisplays());
879 EXPECT_FALSE(display_manager->IsMirrored()); 885 EXPECT_FALSE(display_manager->IsMirrored());
880 } 886 }
881 887
882 } // namespace internal 888 } // namespace internal
883 } // namespace ash 889 } // namespace ash
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