Flip the flag to enable smooth screen rotation by default.

ash/test/ash_test_helper.cc

 // Copyright 2013 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_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
+#include "ash/ash_switches.h"
 #include "ash/aura/shell_port_classic.h"
 #include "ash/mus/bridge/shell_port_mash.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/shell_port.h"
 #include "ash/system/screen_layout_observer.h"
@@ skipping 20 matching lines @@
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/platform_window_defaults.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/display/display_switches.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/message_center/message_center.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/wm_state.h"
 
 using display::ManagedDisplayInfo;
 
@@ skipping 18 matching lines @@
       test_screenshot_delegate_(nullptr),
       dbus_thread_manager_initialized_(false),
       bluez_dbus_manager_initialized_(false) {
   ui::test::EnableTestConfigForPlatformWindows();
   aura::test::InitializeAuraEventGeneratorDelegate();
 }
 
 AshTestHelper::~AshTestHelper() {}
 
 void AshTestHelper::SetUp(bool start_session) {
+  command_line_ = base::MakeUnique<base::test::ScopedCommandLine>();
+  // 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.
+  if (!command_line_->GetProcessCommandLine()->HasSwitch(
+          ::switches::kHostWindowBounds)) {
+    command_line_->GetProcessCommandLine()->AppendSwitchASCII(
+        ::switches::kHostWindowBounds, "1+1-800x600");
+  }
+
+  // TODO(wutao): We enabled a smooth screen rotation animation, which is using
+  // an asynchronous method. However for some tests require to evaluate the
+  // screen rotation immediately after the operation of setting display
+  // rotation, we need to append a slow screen rotation animation flag to pass
+  // the tests. When we remove the flag "ash-disable-smooth-screen-rotation", we
+  // need to disable the screen rotation animation in the test.
+  if (!command_line_->GetProcessCommandLine()->HasSwitch(
+          switches::kAshDisableSmoothScreenRotation)) {
+    command_line_->GetProcessCommandLine()->AppendSwitch(
+        switches::kAshDisableSmoothScreenRotation);
+  }
+
   if (config_ == Config::MUS)
     input_device_client_ = base::MakeUnique<ui::InputDeviceClient>();
 
   display::ResetDisplayIdForTest();
   if (config_ != Config::CLASSIC)
     aura::test::EnvTestHelper().SetAlwaysUseLastMouseLocation(true);
   // WindowManager creates WMState for mash.
   if (config_ == Config::CLASSIC)
     wm_state_ = base::MakeUnique<::wm::WMState>();
   test_views_delegate_ = ash_test_environment_->CreateViewsDelegate();
@@ skipping 123 matching lines @@
   ui::TerminateContextFactoryForTests();
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
   test_views_delegate_.reset();
   wm_state_.reset();
 
   input_device_client_.reset();
 
+  command_line_.reset();
+
   // WindowManager owns the CaptureController for mus/mash.
   CHECK(config_ != Config::CLASSIC || !::wm::CaptureController::Get());
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 // static
@@ skipping 143 matching lines @@
   std::set<RootWindowController*> roots =
       window_manager_app_->window_manager()->GetRootWindowControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace test
 }  // namespace ash