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

Unified Diff: ash/display/display_manager_unittest.cc

Issue 2370913002: Removes AshTestBase::SupportsHostWindowResize (Closed)
Patch Set: feedback Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 5c32140df25ae79f7dbe2e74cfe36d94e270b974..6cff4d35f9acc477cab293bb2d35e36f08a1f80b 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -22,6 +22,7 @@
#include "base/format_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
+#include "build/build_config.h"
#include "grit/ash_strings.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
@@ -626,10 +627,9 @@ TEST_P(DisplayManagerTest, ZeroOverscanInsets) {
EXPECT_EQ(display2_id, changed()[0].id());
}
+#if !defined(OS_WIN)
+// Disabled on windows because of http://crbug.com/650326.
TEST_P(DisplayManagerTest, TestDeviceScaleOnlyChange) {
- if (!SupportsHostWindowResize())
- return;
-
UpdateDisplay("1000x600");
aura::WindowTreeHost* host = Shell::GetPrimaryRootWindow()->GetHost();
EXPECT_EQ(1, host->compositor()->device_scale_factor());
@@ -643,6 +643,7 @@ TEST_P(DisplayManagerTest, TestDeviceScaleOnlyChange) {
EXPECT_EQ("500x300",
Shell::GetPrimaryRootWindow()->bounds().size().ToString());
}
+#endif
display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
const gfx::Rect& bounds) {
« no previous file with comments | « ash/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/mus/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698