Flip the flag to enable smooth screen rotation by default.

ash/display/display_manager_unittest.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 "ui/display/manager/display_manager.h"
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_configuration_controller.h"
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shared/app_types.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/display_configuration_controller_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "ash/test/screen_orientation_controller_test_api.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 2982 matching lines @@
     WmWindow* wm_window_l = WmWindow::Get(window_l);
     wm_window_l->SetAppType(static_cast<int>(AppType::CHROME_APP));
     orientation_controller->LockOrientationForWindow(
         wm_window_l, blink::kWebScreenOrientationLockLandscape,
         ScreenOrientationController::LockCompletionBehavior::None);
   }
 
   DisplayConfigurationController* configuration_controller =
       shell->display_configuration_controller();
   display::Screen* screen = display::Screen::GetScreen();
+  test::DisplayConfigurationControllerTestApi display_config_controller_testapi(
+      configuration_controller);
+  display_config_controller_testapi.SetEnableScreenRotationAnimator(
+      screen->GetPrimaryDisplay().id(), false);
 
   // Rotate to portrait in clamshell.
   configuration_controller->SetDisplayRotation(
       screen->GetPrimaryDisplay().id(), display::Display::ROTATE_90,
       display::Display::ROTATION_SOURCE_USER);
   EXPECT_EQ(display::Display::ROTATE_90,
             screen->GetPrimaryDisplay().rotation());
   EXPECT_FALSE(display_manager->registered_internal_display_rotation_lock());
 
   EXPECT_EQ(0, test_observer.countAndReset());
@@ skipping 70 matching lines @@
   EXPECT_EQ(display::Display::ROTATE_0, screen->GetPrimaryDisplay().rotation());
   EXPECT_EQ(display::Display::ROTATE_90,
             display_manager->registered_internal_display_rotation());
 
   // ANY will rotate to locked ortation.
   wm::ActivateWindow(window_a);
   EXPECT_EQ(display::Display::ROTATE_90,
             screen->GetPrimaryDisplay().rotation());
 
   orientation_controller->RemoveObserver(&test_observer);
+  display_config_controller_testapi.SetEnableScreenRotationAnimator(
+      screen->GetPrimaryDisplay().id(), true);

[oshima, 2017/04/25 17:52:18]

is this necessary?

 }
 
 TEST_F(DisplayManagerOrientationTest, UserRotationLockReverse) {
   Shell* shell = Shell::Get();
   display::DisplayManager* display_manager = shell->display_manager();
   display::test::DisplayManagerTestApi test_api(display_manager);
   test_api.SetFirstDisplayAsInternalDisplay();
   ScreenOrientationController* orientation_controller =
       shell->screen_orientation_controller();
 
   // Set up windows with portrait,lanscape and any.
   aura::Window* window = CreateTestWindowInShellWithId(0);
   WmWindow* wm_window = WmWindow::Get(window);
   wm_window->SetAppType(static_cast<int>(AppType::CHROME_APP));
   display::Screen* screen = display::Screen::GetScreen();
+  test::DisplayConfigurationControllerTestApi display_config_controller_testapi(
+      shell->display_configuration_controller());
+  display_config_controller_testapi.SetEnableScreenRotationAnimator(
+      screen->GetPrimaryDisplay().id(), false);
 
   // Just enabling will not save the lock.
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
 
   orientation_controller->LockOrientationForWindow(
       wm_window, blink::kWebScreenOrientationLockPortrait,
       ScreenOrientationController::LockCompletionBehavior::None);
   EXPECT_EQ(display::Display::ROTATE_90,
             screen->GetPrimaryDisplay().rotation());
@@ skipping 10 matching lines @@
   // Enable lock at 90.
   orientation_controller->ToggleUserRotationLock();
   EXPECT_TRUE(display_manager->registered_internal_display_rotation_lock());
   EXPECT_EQ(display::Display::ROTATE_90,
             display_manager->registered_internal_display_rotation());
 
   orientation_controller->OnAccelerometerUpdated(portrait_secondary);
 
   EXPECT_EQ(display::Display::ROTATE_90,
             screen->GetPrimaryDisplay().rotation());
+
+  display_config_controller_testapi.SetEnableScreenRotationAnimator(
+      screen->GetPrimaryDisplay().id(), true);
 }
 
 TEST_F(DisplayManagerOrientationTest, LockToSpecificOrientation) {
   Shell* shell = Shell::Get();
   display::DisplayManager* display_manager = shell->display_manager();
   display::test::DisplayManagerTestApi(display_manager)
       .SetFirstDisplayAsInternalDisplay();
+  test::DisplayConfigurationControllerTestApi display_config_controller_testapi(
+      Shell::Get()->display_configuration_controller());
+  display_config_controller_testapi.SetEnableScreenRotationAnimator(
+      display_manager->GetDisplayAt(0).id(), false);
   ScreenOrientationController* orientation_controller =
       shell->screen_orientation_controller();
   test::ScreenOrientationControllerTestApi test_api(orientation_controller);
 
   aura::Window* window_a = CreateTestWindowInShellWithId(0);
   {
     WmWindow* wm_window_a = WmWindow::Get(window_a);
     wm_window_a->SetAppType(static_cast<int>(AppType::CHROME_APP));
     orientation_controller->LockOrientationForWindow(
         wm_window_a, blink::kWebScreenOrientationLockAny,
@@ skipping 33 matching lines @@
 
   // Swtching to |window_a| enables rotation.
   EXPECT_EQ(blink::kWebScreenOrientationLockPortraitPrimary,
             test_api.GetCurrentOrientation());
 
   // The orientation has alraedy been locked to secondary once, so
   // it should swtich back to the portrait secondary.
   wm::ActivateWindow(window_ps);
   EXPECT_EQ(blink::kWebScreenOrientationLockPortraitSecondary,
             test_api.GetCurrentOrientation());
+  display_config_controller_testapi.SetEnableScreenRotationAnimator(
+      display_manager->GetDisplayAt(0).id(), true);
 }
 
 }  // namespace ash