Improve existing lock transition - remove black splash.

ash/wm/power_button_controller_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 "ash/wm/power_button_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/cursor_manager.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 81 matching lines @@
   EXPECT_EQ(1, delegate_->num_lock_requests());
 
   // Notify that we locked successfully.
   controller_->OnStartingLock();
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
           PowerButtonController::ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS,
           PowerButtonController::ANIMATION_FAST_CLOSE));
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
-          PowerButtonController::SCREEN_LOCKER_CONTAINERS,
+          PowerButtonController::SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER,
           PowerButtonController::ANIMATION_HIDE));
 
   // Notify that the lock window is visible.  We should make it fade in.
   controller_->OnLockStateChanged(true);
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
           PowerButtonController::SCREEN_LOCKER_AND_RELATED_CONTAINERS,
           PowerButtonController::ANIMATION_FADE_IN));
 
   // We shouldn't progress towards the shutdown state, however.
   EXPECT_FALSE(test_api_->lock_to_shutdown_timer_is_running());
   EXPECT_FALSE(test_api_->shutdown_timer_is_running());
   controller_->OnPowerButtonEvent(false, base::TimeTicks::Now());
 
   // Hold the button again and check that we start shutting down.
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_EQ(0, delegate_->num_shutdown_requests());
+  // Previously we're checking that ALL_CONTAINERS are animated which was in
+  // fact checking that
+  // 1. ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS have transform
+  //    (including wallpaper). They're in this state after lock.
+  // 2. SCREEN_LOCKER_AND_RELATED_CONTAINERS are in fact animating
+  //    (shutdown is in progress).
+  // With http://crbug.com/144737 we no longer animate wallpaper during lock
+  // so it makes sense only to check that SCREEN_LOCKER_AND_RELATED_CONTAINERS
+  // are animated during shutdown.
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
-          PowerButtonController::ALL_CONTAINERS,
+          PowerButtonController::SCREEN_LOCKER_AND_RELATED_CONTAINERS,
           PowerButtonController::ANIMATION_FAST_CLOSE));
   EXPECT_FALSE(cursor_visible());
   EXPECT_TRUE(test_api_->real_shutdown_timer_is_running());
   test_api_->trigger_real_shutdown_timeout();
   EXPECT_EQ(1, delegate_->num_shutdown_requests());
 }
 
 // Test that we start shutting down immediately if the power button is pressed
 // while we're not logged in on an unofficial system.
 TEST_F(PowerButtonControllerTest, LegacyNotLoggedIn) {
@@ skipping 73 matching lines @@
   controller_->set_has_legacy_power_button_for_test(false);
   controller_->OnLoginStateChanged(user::LOGGED_IN_USER);
   controller_->OnLockStateChanged(false);
   EXPECT_FALSE(test_api_->BackgroundLayerIsVisible());
 
   // We should initially be showing the screen locker containers, since they
   // also contain login-related windows that we want to show during the
   // logging-in animation.
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
-          PowerButtonController::SCREEN_LOCKER_CONTAINERS,
+          PowerButtonController::SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER,
           PowerButtonController::ANIMATION_RESTORE));
 
   // Press the power button and check that the lock timer is started and that we
   // start scaling the non-screen-locker containers.
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_TRUE(test_api_->lock_timer_is_running());
   EXPECT_FALSE(test_api_->shutdown_timer_is_running());
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
           PowerButtonController::ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS,
@@ skipping 26 matching lines @@
   EXPECT_TRUE(test_api_->BackgroundLayerIsVisible());
 
   // Notify that we locked successfully.
   controller_->OnStartingLock();
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
           PowerButtonController::ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS,
           PowerButtonController::ANIMATION_FAST_CLOSE));
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
-          PowerButtonController::SCREEN_LOCKER_CONTAINERS,
+          PowerButtonController::SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER,
           PowerButtonController::ANIMATION_HIDE));
 
   // Notify that the lock window is visible.  We should make it fade in.
   controller_->OnLockStateChanged(true);
   EXPECT_TRUE(
       test_api_->ContainerGroupIsAnimated(
           PowerButtonController::SCREEN_LOCKER_AND_RELATED_CONTAINERS,
           PowerButtonController::ANIMATION_FADE_IN));
 
   // When we release the power button, the lock-to-shutdown timer should be
@@ skipping 284 matching lines @@
 
   // After increasing the brightness to 10%, we should start the timer like
   // usual.
   controller_->OnScreenBrightnessChanged(10.0);
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_TRUE(test_api_->lock_timer_is_running());
 }
 
 }  // namespace test
 }  // namespace ash