Revert 284850 "aura: Use PlatformWindow from WindowTreeHostWin."

trunk/src/ash/test/ash_test_base.cc

Index: trunk/src/ash/test/ash_test_base.cc
===================================================================
--- trunk/src/ash/test/ash_test_base.cc	(revision 284904)
+++ trunk/src/ash/test/ash_test_base.cc	(working copy)
@@ -44,7 +44,6 @@
 #include "base/win/windows_version.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/aura/window_tree_host_win.h"
-#include "ui/platform_window/win/win_window.h"
 #include "win8/test/test_registrar_constants.h"
 #endif
 
@@ -124,7 +123,7 @@
         switches::kAshHostWindowBounds, "1+1-800x600");
   }
 #if defined(OS_WIN)
-  ui::test::SetUsePopupAsRootWindowForTest(true);
+  aura::test::SetUsePopupAsRootWindowForTest(true);
 #endif
   ash_test_helper_->SetUp(start_session_);
 
@@ -174,7 +173,7 @@
 
   ash_test_helper_->TearDown();
 #if defined(OS_WIN)
-  ui::test::SetUsePopupAsRootWindowForTest(false);
+  aura::test::SetUsePopupAsRootWindowForTest(false);
   // Kill the viewer process if we spun one up.
   metro_viewer_host_.reset();