Revert 284850 "aura: Use PlatformWindow from WindowTreeHostWin."

trunk/src/ash/test/ash_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 26 matching lines @@
 #include "ash/system/chromeos/tray_display.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ash/test/test_metro_viewer_process_host.h"
 #include "base/test/test_process_killer_win.h"
 #include "base/win/metro.h"
 #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
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_connection.h"
 #endif
 
 namespace ash {
 namespace test {
 namespace {
@@ skipping 59 matching lines @@
 
   // TODO(jamescook): Can we do this without changing command line?
   // Use the origin (1,1) so that it doesn't over
   // lap with the native mouse cursor.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kAshHostWindowBounds)) {
     command_line->AppendSwitchASCII(
         switches::kAshHostWindowBounds, "1+1-800x600");
   }
 #if defined(OS_WIN)
-  ui::test::SetUsePopupAsRootWindowForTest(true);
+  aura::test::SetUsePopupAsRootWindowForTest(true);
 #endif
   ash_test_helper_->SetUp(start_session_);
 
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->GetHost()->Show();
   // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
   Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
   ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
 
@@ skipping 29 matching lines @@
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kForceAshToDesktop)) {
     // Check that our viewer connection is still established.
     CHECK(!metro_viewer_host_->closed_unexpectedly());
   }
 #endif
 
   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();
 
   // Clean up any dangling viewer processes as the metro APIs sometimes leave
   // zombies behind. A default browser process in metro will have the
   // following command line arg so use that to avoid killing all processes named
   // win8::test::kDefaultTestExePath.
   const wchar_t kViewerProcessArgument[] = L"DefaultBrowserServer";
   base::KillAllNamedProcessesWithArgument(win8::test::kDefaultTestExePath,
                                           kViewerProcessArgument);
@@ skipping 148 matching lines @@
 
 void AshTestBase::UnblockUserSession() {
   Shell::GetInstance()->session_state_delegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 
 }  // namespace test
 }  // namespace ash