Enable Virtual Screen Coordinates and remove --ash-virtual-screen-coordinates

Update tests to work with VSC.

I'll land this after http://codereview.chromium.org/10795027/ is landed.

I kept active_root_window_ because we're planning to create a launcher per display, and I'm going to use it to decide on which display the status bubble will be shown.

BUG=123160
TEST=Updated tests, plus added new test cases to ExtendedDesktopText.ConvertPoint

Review URL: https://chromiumcodereview.appspot.com/10790090

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147977 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 5197e38..6bb3b72 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -23,14 +23,12 @@ class ScreenAshTest : public test::AshTestBase {
 
   virtual void SetUp() OVERRIDE {
     internal::DisplayController::SetExtendedDesktopEnabled(true);
-    internal::DisplayController::SetVirtualScreenCoordinatesEnabled(true);
     AshTestBase::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     AshTestBase::TearDown();
     internal::DisplayController::SetExtendedDesktopEnabled(false);
-    internal::DisplayController::SetVirtualScreenCoordinatesEnabled(false);
   }
 
  private:
@@ -39,7 +37,7 @@ class ScreenAshTest : public test::AshTestBase {
 
 #if !defined(OS_WIN)
 TEST_F(ScreenAshTest, Bounds) {
-  UpdateDisplay("0+0-600x600,600+0-500x500");
+  UpdateDisplay("600x600,500x500");
 
   views::Widget* primary =
       views::Widget::CreateWindowWithBounds(NULL, gfx::Rect(10, 10, 100, 100));
@@ -83,7 +81,7 @@ TEST_F(ScreenAshTest, Bounds) {
 #endif
 
 TEST_F(ScreenAshTest, ConvertRect) {
-  UpdateDisplay("0+0-600x600,600+0-500x500");
+  UpdateDisplay("600x600,500x500");
 
   views::Widget* primary =
       views::Widget::CreateWindowWithBounds(NULL, gfx::Rect(10, 10, 100, 100));