summaryrefslogtreecommitdiffstats
path: root/ash/dip_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 15:17:00 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 15:17:00 +0000
commit2e2216e43424120be34fe6cab1136eddecbeb4a0 (patch)
treed05aa7261bc1dede9afdaff0e45219d4d0d5b1aa /ash/dip_unittest.cc
parent8a06ebd3e04a184fc424e8dc87aa6a9d25dde1d4 (diff)
downloadchromium_src-2e2216e43424120be34fe6cab1136eddecbeb4a0.zip
chromium_src-2e2216e43424120be34fe6cab1136eddecbeb4a0.tar.gz
chromium_src-2e2216e43424120be34fe6cab1136eddecbeb4a0.tar.bz2
Remove ui-enable-dip option
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10310067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/dip_unittest.cc')
-rw-r--r--ash/dip_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 16335b3..e900fde 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -17,7 +17,6 @@
#include "ui/aura/client/activation_client.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
-#include "ui/compositor/dip_util.h"
#include "ui/compositor/layer.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/monitor.h"
@@ -37,7 +36,6 @@ typedef ash::test::AshTestBase DIPTest;
// Test if the WM sets correct work area under different density.
TEST_F(DIPTest, MAYBE_WorkArea) {
- ui::test::ScopedDIPEnablerForTest enable;
ChangeMonitorConfig(1.0f, gfx::Rect(0, 0, 1000, 900));
aura::RootWindow* root = Shell::GetRootWindow();