Revert "Use WS_POPUP for ash_unittests"

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/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "content/public/test/web_contents_tester.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
-#if defined(OS_WIN)
-#include "ui/aura/root_window_host_win.h"
-#endif
-
 namespace ash {
 namespace test {
 
 content::WebContents* AshTestViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return content::WebContentsTester::CreateTestWebContents(browser_context,
                                                            site_instance);
 }
 
 AshTestBase::AshTestBase() : test_shell_delegate_(NULL) {
 }
 
 AshTestBase::~AshTestBase() {
 }
 
 void AshTestBase::SetUp() {
-  // Use the origin (1,1) so that it doesn't over
-  // lap with the native mouse cursor.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kAuraHostWindowSize, "1+1-800x600");
-#if defined(OS_WIN)
-  aura::test::SetUsePopupAsRootWindowForTest(true);
-#endif
+      switches::kAuraHostWindowSize, "0+0-800x600");
   // Disable animations during tests.
   ui::LayerAnimator::set_disable_animations_for_test(true);
   ui::TextInputTestSupport::Initialize();
   // Creates Shell and hook with Desktop.
   test_shell_delegate_ = new TestShellDelegate;
   ash::Shell::CreateInstance(test_shell_delegate_);
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->ShowRootWindow();
-  // Move the mouse cursor to (0,0) so that native events doesn't
+  // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
-  Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(0, 0));
+  Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
   Shell::GetInstance()->cursor_manager()->ShowCursor(true);
 }
 
 void AshTestBase::TearDown() {
   // Flush the message loop to finish pending release tasks.
   RunAllPendingInMessageLoop();
 
   // Tear down the shell.
   Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   ui::TextInputTestSupport::Shutdown();
-#if defined(OS_WIN)
-  aura::test::SetUsePopupAsRootWindowForTest(false);
-#endif
 }
 
 void AshTestBase::ChangeDisplayConfig(float scale,
                                       const gfx::Rect& bounds_in_pixel) {
   gfx::Display display =
       gfx::Display(Shell::GetScreen()->GetPrimaryDisplay().id());
   display.SetScaleAndBounds(scale, bounds_in_pixel);
   std::vector<gfx::Display> displays;
   displays.push_back(display);
   Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
@@ skipping 68 matching lines @@
 void AshTestBase::SetUserLoggedIn(bool user_logged_in) {
   test_shell_delegate_->SetUserLoggedIn(user_logged_in);
 }
 
 void AshTestBase::SetCanLockScreen(bool can_lock_screen) {
   test_shell_delegate_->SetCanLockScreen(can_lock_screen);
 }
 
 }  // namespace test
 }  // namespace ash