mash: remove the LockStateControllerDelegate.

ash/wm/lock_state_controller_unittest.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/wm/lock_state_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/test_lock_state_controller_delegate.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_animator.h"
 #include "ash/test/test_shell_delegate.h"
+#include "ash/test/test_shutdown_client.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/fake_display_snapshot.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/events/test/event_generator.h"
@@ skipping 12 matching lines @@
     (*flag) = true;
 }
 
 }  // namespace
 
 class LockStateControllerTest : public AshTestBase {
  public:
   LockStateControllerTest()
       : power_button_controller_(nullptr),
         lock_state_controller_(nullptr),
-        lock_state_controller_delegate_(nullptr),
+        shutdown_client_(nullptr),
         session_manager_client_(nullptr),
         test_animator_(nullptr) {}
   ~LockStateControllerTest() override {}
 
   void SetUp() override {
     session_manager_client_ = new chromeos::FakeSessionManagerClient;
     chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         base::WrapUnique(session_manager_client_));
     AshTestBase::SetUp();
 
-    std::unique_ptr<LockStateControllerDelegate> lock_state_controller_delegate(
-        lock_state_controller_delegate_ = new TestLockStateControllerDelegate);
+    std::unique_ptr<TestShutdownClient> shutdown_client(
+        shutdown_client_ = new TestShutdownClient);

[James Cook, 2016/11/02 20:20:03]

nit: This construct made me do a double-take. Please split this into two
separate statements.

[Elliot Glaysher, 2016/11/02 21:45:16]

Done.

     test_animator_ = new TestSessionStateAnimator;
 
     lock_state_controller_ = Shell::GetInstance()->lock_state_controller();
-    lock_state_controller_->SetDelegate(
-        std::move(lock_state_controller_delegate));
     lock_state_controller_->set_animator_for_test(test_animator_);
 
     test_api_.reset(new LockStateController::TestApi(lock_state_controller_));
+    test_api_->SetShutdownClient(std::move(shutdown_client));
 
     power_button_controller_ = Shell::GetInstance()->power_button_controller();
 
     shell_delegate_ =
         static_cast<TestShellDelegate*>(WmShell::Get()->delegate());
   }
 
   void TearDown() override {
     AshTestBase::TearDown();
     chromeos::DBusThreadManager::Shutdown();
   }
 
  protected:
   void GenerateMouseMoveEvent() {
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
     generator.MoveMouseTo(10, 10);
   }
 
   int NumShutdownRequests() {
-    return lock_state_controller_delegate_->num_shutdown_requests() +
+    return shutdown_client_->num_shutdown_requests() +
            shell_delegate_->num_exit_requests();
   }
 
   void Advance(SessionStateAnimator::AnimationSpeed speed) {
     test_animator_->Advance(test_animator_->GetDuration(speed));
   }
 
   void AdvancePartially(SessionStateAnimator::AnimationSpeed speed,
                         float factor) {
     base::TimeDelta duration = test_animator_->GetDuration(speed);
@@ skipping 216 matching lines @@
         legacy_button);
     lock_state_controller_->OnLoginStateChanged(status);
     SetUserLoggedIn(status != LoginStatus::NOT_LOGGED_IN);
     if (status == LoginStatus::GUEST)
       TestSessionStateDelegate::SetCanLockScreen(false);
     lock_state_controller_->OnLockStateChanged(false);
   }
 
   PowerButtonController* power_button_controller_;  // not owned
   LockStateController* lock_state_controller_;      // not owned
-  TestLockStateControllerDelegate*
-      lock_state_controller_delegate_;            // not owned
+  TestShutdownClient* shutdown_client_;             // not owned
   // Ownership is passed on to chromeos::DBusThreadManager.
   chromeos::FakeSessionManagerClient* session_manager_client_;
   TestSessionStateAnimator* test_animator_;       // not owned
   std::unique_ptr<LockStateController::TestApi> test_api_;
   TestShellDelegate* shell_delegate_;  // not owned
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LockStateControllerTest);
 };
 
@@ skipping 747 matching lines @@
   ReleasePowerButton();
 
   ExpectPreLockAnimationStarted();
 
   test_animator_->CompleteAllAnimations(true);
   EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count());
 }
 
 }  // namespace test
 }  // namespace ash