chromeos: Simplify ShutdownPolicyHandler

chrome/browser/chromeos/settings/shutdown_policy_handler_unittest.cc

 // Copyright 2014 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 "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 class ShutdownPolicyHandlerTest : public testing::Test,
                                   public ShutdownPolicyHandler::Delegate {
  public:
-  void ResultCallback(bool reboot_on_shutdown) {
-    reboot_on_shutdown_ = reboot_on_shutdown;
-    callback_called_ = true;
-  }
-
- protected:
   ShutdownPolicyHandlerTest()
-      : callback_called_(false),
-        reboot_on_shutdown_(false),
-        delegate_invocations_count_(0) {}
+      : reboot_on_shutdown_(false), delegate_invocations_count_(0) {}
 
   // testing::Test:
   void SetUp() override {
     testing::Test::SetUp();
     DBusThreadManager::Initialize();
     settings_helper_.ReplaceProvider(kRebootOnShutdown);
   }
 
   void TearDown() override { DBusThreadManager::Shutdown(); }
 
   void SetRebootOnShutdown(bool reboot_on_shutdown) {
     settings_helper_.SetBoolean(kRebootOnShutdown, reboot_on_shutdown);
     base::RunLoop().RunUntilIdle();
   }
 
   // ShutdownPolicyHandler::Delegate:
   void OnShutdownPolicyChanged(bool reboot_on_shutdown) override {
     reboot_on_shutdown_ = reboot_on_shutdown;
     delegate_invocations_count_++;
   }
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   ScopedCrosSettingsTestHelper settings_helper_;
-  bool callback_called_;
   bool reboot_on_shutdown_;
   int delegate_invocations_count_;
 };
 
 TEST_F(ShutdownPolicyHandlerTest, RetrieveTrustedDevicePolicies) {
   ShutdownPolicyHandler shutdown_policy_observer(CrosSettings::Get(), this);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, delegate_invocations_count_);
 
+  // Changing the setting to true notifies the delegate.
   SetRebootOnShutdown(true);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, delegate_invocations_count_);
   EXPECT_TRUE(reboot_on_shutdown_);
 
+  // Changing the setting to false notifies the delegate.
   SetRebootOnShutdown(false);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(2, delegate_invocations_count_);
   EXPECT_FALSE(reboot_on_shutdown_);
-
-  shutdown_policy_observer.Shutdown();
-
-  SetRebootOnShutdown(true);
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(2, delegate_invocations_count_);
-  EXPECT_FALSE(reboot_on_shutdown_);
 }
 
 TEST_F(ShutdownPolicyHandlerTest, CheckIfRebootOnShutdown) {
   ShutdownPolicyHandler shutdown_policy_observer(CrosSettings::Get(), this);
   base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(0, delegate_invocations_count_);
+  EXPECT_FALSE(reboot_on_shutdown_);
 
   // Allow shutdown.
   SetRebootOnShutdown(true);
-  callback_called_ = false;
-  shutdown_policy_observer.CheckIfRebootOnShutdown(
-      base::Bind(&ShutdownPolicyHandlerTest::ResultCallback,
-                 base::Unretained(this)));
+  delegate_invocations_count_ = 0;
+  // Request an explicit check.
+  shutdown_policy_observer.CheckIfRebootOnShutdown();
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(1, delegate_invocations_count_);
   EXPECT_TRUE(reboot_on_shutdown_);
+
   // Forbid shutdown.
   SetRebootOnShutdown(false);
-  callback_called_ = false;
-  shutdown_policy_observer.CheckIfRebootOnShutdown(
-      base::Bind(&ShutdownPolicyHandlerTest::ResultCallback,
-                 base::Unretained(this)));
+  delegate_invocations_count_ = 0;
+  // Request an explicit check.
+  shutdown_policy_observer.CheckIfRebootOnShutdown();
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(1, delegate_invocations_count_);
   EXPECT_FALSE(reboot_on_shutdown_);
 }
 
 }  // namespace chromeos