Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP.

ash/wm/workspace/workspace_layout_manager2_unittest.cc

Index: ash/wm/workspace/workspace_layout_manager2_unittest.cc
===================================================================
--- ash/wm/workspace/workspace_layout_manager2_unittest.cc	(revision 164764)
+++ ash/wm/workspace/workspace_layout_manager2_unittest.cc	(working copy)
@@ -13,7 +13,9 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/screen.h"
 
 namespace ash {
 
@@ -145,14 +147,15 @@
       100, 101, work_area.width() + 1, work_area.height() + 2);
   scoped_ptr<aura::Window> window(CreateTestWindow(window_bounds));
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
-      window->bounds().ToString());
+            window->bounds().ToString());
 
   // Directly setting the bounds triggers a slightly different code path. Verify
   // that too.
   window->SetBounds(window_bounds);
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
-      window->bounds().ToString());
+            window->bounds().ToString());
 }
 
 }  // namespace
+
 }  // namespace ash