Enable device disabling during normal operation

chrome/browser/chromeos/system/device_disabling_manager_unittest.cc

Index: chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
diff --git a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
index 4ef3eef34371728166b221d32fa1504dc2a2ca60..26268494b61a7e6d959f77b17e998be65d7bd916 100644
--- a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
@@ -7,92 +7,172 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process_platform_part.h"
+#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
+#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/ownership/mock_owner_key_util.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "policy/proto/device_management_backend.pb.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using testing::_;
+using testing::Mock;
+
 namespace chromeos {
 namespace system {
 
 namespace {
 
-const char kDisabledMessage[] = "Device disabled.";
+const char kTestUser[] = "user@example.com";
+const char kDisabledMessage1[] = "Device disabled 1.";
+const char kDisabledMessage2[] = "Device disabled 2.";
 
 }
 
-class DeviceDisablingManagerTest : public testing::Test {
+class DeviceDisablingManagerTestBase : public testing::Test,
+                                       public DeviceDisablingManager::Delegate {
  public:
-  DeviceDisablingManagerTest();
+  DeviceDisablingManagerTestBase();
 
   // testing::Test:
+  void TearDown() override;
+
+  virtual void CreateDeviceDisablingManager();
+  virtual void DestroyDeviceDisablingManager();
+
+  void SetRegistrationUser(const std::string& registration_user);
+  void SetDeviceMode(policy::DeviceMode device_mode);
+  void LogIn();
+
+  // DeviceDisablingManager::Delegate:
+  MOCK_METHOD0(RestartToLoginScreen, void());
+  MOCK_METHOD0(ShowDeviceDisabledScreen, void());
+
+  const std::string& GetDisabledMessage() const;

[achuithb, 2014/11/07 00:15:17]

Why special case this since you're providing access to
device_disabling_manager_?

[bartfab (slow), 2014/11/07 10:11:37]

Removed.

+
+ protected:
+  scoped_ptr<DeviceDisablingManager> device_disabling_manager_;

[achuithb, 2014/11/07 00:15:17]

Might be nicer to provide a pointer to subclasses instead, like
DeviceDisablingManager* GetDeviceDisablingManager() { return
device_disabling_manager_.get(); }

[bartfab (slow), 2014/11/07 10:11:37]

Done.

+
+ private:
+  policy::ScopedStubEnterpriseInstallAttributes install_attributes_;
+  chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
+  chromeos::ScopedTestCrosSettings test_cros_settings_;
+  FakeUserManager fake_user_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManagerTestBase);
+};
+
+DeviceDisablingManagerTestBase::DeviceDisablingManagerTestBase()
+    : install_attributes_("", "", "", policy::DEVICE_MODE_NOT_SET) {
+}
+
+void DeviceDisablingManagerTestBase::TearDown() {
+  DestroyDeviceDisablingManager();
+}
+
+void DeviceDisablingManagerTestBase::CreateDeviceDisablingManager() {
+  device_disabling_manager_.reset(new DeviceDisablingManager(
+      this,
+      CrosSettings::Get(),
+      &fake_user_manager_));
+}
+
+void DeviceDisablingManagerTestBase::DestroyDeviceDisablingManager() {
+  device_disabling_manager_.reset();
+}
+
+void DeviceDisablingManagerTestBase::SetRegistrationUser(
+    const std::string& registration_user) {
+  reinterpret_cast<policy::StubEnterpriseInstallAttributes*>(
+      TestingBrowserProcess::GetGlobal()->platform_part()->
+          browser_policy_connector_chromeos()->GetInstallAttributes())->
+              SetRegistrationUser(registration_user);
+}
+
+void DeviceDisablingManagerTestBase::SetDeviceMode(
+    policy::DeviceMode device_mode) {
+  reinterpret_cast<policy::StubEnterpriseInstallAttributes*>(
+      TestingBrowserProcess::GetGlobal()->platform_part()->
+          browser_policy_connector_chromeos()->GetInstallAttributes())->
+              SetMode(device_mode);
+}
+
+void DeviceDisablingManagerTestBase::LogIn() {
+  fake_user_manager_.AddUser(kTestUser);
+}
+
+const std::string& DeviceDisablingManagerTestBase::GetDisabledMessage() const {
+  return device_disabling_manager_->disabled_message();
+}
+
+// Base class for tests that verify device disabling behavior during OOBE, when
+// the device is not owned yet.
+class DeviceDisablingManagerOOBETest : public DeviceDisablingManagerTestBase {
+ public:
+  DeviceDisablingManagerOOBETest();
+
+  // DeviceDisablingManagerTestBase:
   void SetUp() override;
   void TearDown() override;
 
   bool device_disabled() const { return device_disabled_; }
-  const std::string& GetDisabledMessage() const;
 
   void CheckWhetherDeviceDisabledDuringOOBE();
 
   void SetDeviceDisabled(bool disabled);
-  void SetDeviceMode(policy::DeviceMode device_mode);
 
  private:
   void OnDeviceDisabledChecked(bool device_disabled);
 
-  policy::ScopedStubEnterpriseInstallAttributes install_attributes_;
   TestingPrefServiceSimple local_state_;
 
-  scoped_ptr<DeviceDisablingManager> device_disabling_manager_;
-
   base::RunLoop run_loop_;
   bool device_disabled_;
 
-  DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManagerOOBETest);
 };
 
-DeviceDisablingManagerTest::DeviceDisablingManagerTest()
-    : install_attributes_("", "", "", policy::DEVICE_MODE_NOT_SET),
-      device_disabled_(false) {
+DeviceDisablingManagerOOBETest::DeviceDisablingManagerOOBETest()
+    : device_disabled_(false) {
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
 }
 
-void DeviceDisablingManagerTest::SetUp() {
+void DeviceDisablingManagerOOBETest::SetUp() {
   TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
   policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(
       local_state_.registry());
-
-  device_disabling_manager_.reset(new DeviceDisablingManager(
-      TestingBrowserProcess::GetGlobal()->platform_part()->
-          browser_policy_connector_chromeos()));
+  CreateDeviceDisablingManager();
 }
 
-void DeviceDisablingManagerTest::TearDown() {
+void DeviceDisablingManagerOOBETest::TearDown() {
+  DeviceDisablingManagerTestBase::TearDown();
   TestingBrowserProcess::GetGlobal()->SetLocalState(nullptr);
 }
 
-const std::string& DeviceDisablingManagerTest::GetDisabledMessage() const {
-  return device_disabling_manager_->disabled_message();
-
-}
-
-void DeviceDisablingManagerTest::CheckWhetherDeviceDisabledDuringOOBE() {
+void DeviceDisablingManagerOOBETest::CheckWhetherDeviceDisabledDuringOOBE() {
   device_disabling_manager_->CheckWhetherDeviceDisabledDuringOOBE(
-      base::Bind(&DeviceDisablingManagerTest::OnDeviceDisabledChecked,
+      base::Bind(&DeviceDisablingManagerOOBETest::OnDeviceDisabledChecked,
                  base::Unretained(this)));
   run_loop_.Run();
 }
 
-void DeviceDisablingManagerTest::SetDeviceDisabled(bool disabled) {
+void DeviceDisablingManagerOOBETest::SetDeviceDisabled(bool disabled) {
   DictionaryPrefUpdate dict(&local_state_, prefs::kServerBackedDeviceState);
   if (disabled) {
     dict->SetString(policy::kDeviceStateRestoreMode,
@@ -100,30 +180,24 @@ void DeviceDisablingManagerTest::SetDeviceDisabled(bool disabled) {
   } else {
     dict->Remove(policy::kDeviceStateRestoreMode, nullptr);
   }
-  dict->SetString(policy::kDeviceStateDisabledMessage, kDisabledMessage);
+  dict->SetString(policy::kDeviceStateDisabledMessage, kDisabledMessage1);
 }
 
-void DeviceDisablingManagerTest::SetDeviceMode(policy::DeviceMode device_mode) {
-  reinterpret_cast<policy::StubEnterpriseInstallAttributes*>(
-      TestingBrowserProcess::GetGlobal()->platform_part()->
-          browser_policy_connector_chromeos()->GetInstallAttributes())->
-              SetMode(device_mode);
-}
-
-void DeviceDisablingManagerTest::OnDeviceDisabledChecked(bool device_disabled) {
+void DeviceDisablingManagerOOBETest::OnDeviceDisabledChecked(
+    bool device_disabled) {
   device_disabled_ = device_disabled;
   run_loop_.Quit();
 }
 
 // Verifies that the device is not considered disabled during OOBE by default.
-TEST_F(DeviceDisablingManagerTest, NotDisabledByDefault) {
+TEST_F(DeviceDisablingManagerOOBETest, NotDisabledByDefault) {
   CheckWhetherDeviceDisabledDuringOOBE();
   EXPECT_FALSE(device_disabled());
 }
 
 // Verifies that the device is not considered disabled during OOBE when it is
 // explicitly marked as not disabled.
-TEST_F(DeviceDisablingManagerTest, NotDisabledWhenExplicitlyNotDisabled) {
+TEST_F(DeviceDisablingManagerOOBETest, NotDisabledWhenExplicitlyNotDisabled) {
   SetDeviceDisabled(false);
   CheckWhetherDeviceDisabledDuringOOBE();
   EXPECT_FALSE(device_disabled());
@@ -131,7 +205,7 @@ TEST_F(DeviceDisablingManagerTest, NotDisabledWhenExplicitlyNotDisabled) {
 
 // Verifies that the device is not considered disabled during OOBE when device
 // disabling is turned off by flag, even if the device is marked as disabled.
-TEST_F(DeviceDisablingManagerTest, NotDisabledWhenTurnedOffByFlag) {
+TEST_F(DeviceDisablingManagerOOBETest, NotDisabledWhenTurnedOffByFlag) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisableDeviceDisabling);
   SetDeviceDisabled(true);
@@ -141,7 +215,7 @@ TEST_F(DeviceDisablingManagerTest, NotDisabledWhenTurnedOffByFlag) {
 
 // Verifies that the device is not considered disabled during OOBE when it is
 // already enrolled, even if the device is marked as disabled.
-TEST_F(DeviceDisablingManagerTest, DoNotShowWhenEnterpriseOwned) {
+TEST_F(DeviceDisablingManagerOOBETest, NotDisabledWhenEnterpriseOwned) {
   SetDeviceMode(policy::DEVICE_MODE_ENTERPRISE);
   SetDeviceDisabled(true);
   CheckWhetherDeviceDisabledDuringOOBE();
@@ -150,7 +224,7 @@ TEST_F(DeviceDisablingManagerTest, DoNotShowWhenEnterpriseOwned) {
 
 // Verifies that the device is not considered disabled during OOBE when it is
 // already owned by a consumer, even if the device is marked as disabled.
-TEST_F(DeviceDisablingManagerTest, DoNotShowWhenConsumerOwned) {
+TEST_F(DeviceDisablingManagerOOBETest, NotDisabledWhenConsumerOwned) {
   SetDeviceMode(policy::DEVICE_MODE_CONSUMER);
   SetDeviceDisabled(true);
   CheckWhetherDeviceDisabledDuringOOBE();
@@ -160,11 +234,271 @@ TEST_F(DeviceDisablingManagerTest, DoNotShowWhenConsumerOwned) {
 // Verifies that the device is considered disabled during OOBE when it is marked
 // as disabled, device disabling is not turned off by flag and the device is not
 // owned yet.
-TEST_F(DeviceDisablingManagerTest, ShowWhenDisabledAndNotOwned) {
+TEST_F(DeviceDisablingManagerOOBETest, ShowWhenDisabledAndNotOwned) {
   SetDeviceDisabled(true);
   CheckWhetherDeviceDisabledDuringOOBE();
   EXPECT_TRUE(device_disabled());
-  EXPECT_EQ(kDisabledMessage, GetDisabledMessage());
+  EXPECT_EQ(kDisabledMessage1, GetDisabledMessage());
+}
+
+// Base class for tests that verify device disabling behavior once the device is
+// owned.
+class DeviceDisablingManagerTest : public DeviceDisablingManagerTestBase,
+                                   public DeviceDisablingManager::Observer {
+ public:
+  DeviceDisablingManagerTest();
+
+  // DeviceDisablingManagerTestBase:
+  void TearDown() override;
+  void CreateDeviceDisablingManager() override;
+  void DestroyDeviceDisablingManager() override;
+
+  //DeviceDisablingManager::Observer:
+  MOCK_METHOD1(OnDisabledMessageChanged, void(const std::string&));
+
+  void SetUnowned();
+  void SetEnterpriseOwned();
+  void SetConsumerOwned();
+  void MakeCrosSettingsTrusted();
+
+  void SetDeviceDisabled(bool disabled);
+  void SetDisabledMessage(const std::string& disabled_message);
+
+ private:
+  void SimulatePolicyFetch();
+
+  content::TestBrowserThreadBundle thread_bundle_;
+  chromeos::DeviceSettingsTestHelper device_settings_test_helper_;
+  policy::DevicePolicyBuilder device_policy_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManagerTest);
+};
+
+DeviceDisablingManagerTest::DeviceDisablingManagerTest() {
+}
+
+void DeviceDisablingManagerTest::TearDown() {
+  chromeos::DeviceSettingsService::Get()->UnsetSessionManager();
+  DeviceDisablingManagerTestBase::TearDown();
+}
+
+void DeviceDisablingManagerTest::CreateDeviceDisablingManager() {
+  DeviceDisablingManagerTestBase::CreateDeviceDisablingManager();
+  device_disabling_manager_->AddObserver(this);
+}
+
+void DeviceDisablingManagerTest::DestroyDeviceDisablingManager() {
+  if (device_disabling_manager_)
+    device_disabling_manager_->RemoveObserver(this);
+  DeviceDisablingManagerTestBase::DestroyDeviceDisablingManager();
+}
+
+void DeviceDisablingManagerTest::SetUnowned() {
+  SetRegistrationUser(std::string());
+  SetDeviceMode(policy::DEVICE_MODE_NOT_SET);
+}
+
+void DeviceDisablingManagerTest::SetEnterpriseOwned() {
+  SetRegistrationUser(kTestUser);
+  SetDeviceMode(policy::DEVICE_MODE_ENTERPRISE);
+}
+
+void DeviceDisablingManagerTest::SetConsumerOwned() {
+  SetDeviceMode(policy::DEVICE_MODE_CONSUMER);
+}
+
+void DeviceDisablingManagerTest::MakeCrosSettingsTrusted() {
+  scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util(
+      new ownership::MockOwnerKeyUtil);
+  owner_key_util->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
+  chromeos::DeviceSettingsService::Get()->SetSessionManager(
+      &device_settings_test_helper_,
+      owner_key_util);
+  SimulatePolicyFetch();
+}
+
+void DeviceDisablingManagerTest::SetDeviceDisabled(bool disabled) {
+  if (disabled) {
+    device_policy_.policy_data().mutable_device_state()->set_device_mode(
+        enterprise_management::DeviceState::DEVICE_MODE_DISABLED);
+  } else {
+    device_policy_.policy_data().mutable_device_state()->clear_device_mode();
+  }
+  SimulatePolicyFetch();
+}
+
+void DeviceDisablingManagerTest::SetDisabledMessage(
+    const std::string& disabled_message) {
+  device_policy_.policy_data().mutable_device_state()->
+      mutable_disabled_state()->set_message(disabled_message);
+  SimulatePolicyFetch();
+}
+
+void DeviceDisablingManagerTest::SimulatePolicyFetch() {
+  device_policy_.Build();
+  device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
+  chromeos::DeviceSettingsService::Get()->OwnerKeySet(true);
+  device_settings_test_helper_.Flush();
+}
+
+// Verifies that the device is not considered disabled by default when it is
+// enrolled for enterprise management.
+TEST_F(DeviceDisablingManagerTest, NotDisabledByDefault) {
+  SetEnterpriseOwned();
+  MakeCrosSettingsTrusted();
+
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+}
+
+// Verifies that the device is not considered disabled when it is explicitly
+// marked as not disabled.
+TEST_F(DeviceDisablingManagerTest, NotDisabledWhenExplicitlyNotDisabled) {
+  SetEnterpriseOwned();
+  MakeCrosSettingsTrusted();
+  SetDeviceDisabled(false);
+
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+}
+
+// Verifies that the device is not considered disabled when device disabling is
+// turned off by flag, even if the device is marked as disabled.
+TEST_F(DeviceDisablingManagerTest, NotDisabledWhenTurnedOffByFlag) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kDisableDeviceDisabling);
+  SetEnterpriseOwned();
+  MakeCrosSettingsTrusted();
+  SetDeviceDisabled(true);
+
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+}
+
+// Verifies that the device is not considered disabled when it is owned by a
+// consumer, even if the device is marked as disabled.
+TEST_F(DeviceDisablingManagerTest, NotDisabledWhenConsumerOwned) {
+  SetConsumerOwned();
+  MakeCrosSettingsTrusted();
+  SetDeviceDisabled(true);
+
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+}
+
+// Verifies that the device disabled screen is shown immediately when the device
+// is already marked as disabled on start-up.
+TEST_F(DeviceDisablingManagerTest, DisabledOnLoginScreen) {
+  SetEnterpriseOwned();
+  MakeCrosSettingsTrusted();
+  SetDisabledMessage(kDisabledMessage1);
+  SetDeviceDisabled(true);
+
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(1);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+  EXPECT_EQ(kDisabledMessage1, GetDisabledMessage());
+}
+
+// Verifies that the device disabled screen is shown immediately when the device
+// becomes disabled while the login screen is showing. Also verifies that Chrome
+// restarts when the device becomes enabled again.
+TEST_F(DeviceDisablingManagerTest, DisableAndReEnableOnLoginScreen) {
+  SetEnterpriseOwned();
+  MakeCrosSettingsTrusted();
+  SetDisabledMessage(kDisabledMessage1);
+
+  // Verify that initially, the disabled screen is not shown and Chrome does not
+  // restart.
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+  Mock::VerifyAndClearExpectations(this);
+
+  // Mark the device as disabled. Verify that the device disabled screen is
+  // shown.
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(1);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(kDisabledMessage1)).Times(1);
+  SetDeviceDisabled(true);
+  Mock::VerifyAndClearExpectations(this);
+  EXPECT_EQ(kDisabledMessage1, GetDisabledMessage());
+
+  // Update the disabled message. Verify that the device disabled screen is
+  // updated.
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(kDisabledMessage2)).Times(1);
+  SetDisabledMessage(kDisabledMessage2);
+  Mock::VerifyAndClearExpectations(this);
+  EXPECT_EQ(kDisabledMessage2, GetDisabledMessage());
+
+  // Mark the device as enabled again. Verify that Chrome restarts.
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(1);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  SetDeviceDisabled(false);
+}
+
+// Verifies that Chrome restarts when the device becomes disabled while a
+// session is in progress.
+TEST_F(DeviceDisablingManagerTest, DisableDuringSession) {
+  SetEnterpriseOwned();
+  MakeCrosSettingsTrusted();
+  SetDisabledMessage(kDisabledMessage1);
+  LogIn();
+
+  // Verify that initially, the disabled screen is not shown and Chrome does not
+  // restart.
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(0);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  CreateDeviceDisablingManager();
+  Mock::VerifyAndClearExpectations(this);
+
+  // Mark the device as disabled. Verify that Chrome restarts.
+  EXPECT_CALL(*this, RestartToLoginScreen()).Times(1);
+  EXPECT_CALL(*this, ShowDeviceDisabledScreen()).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(_)).Times(0);
+  EXPECT_CALL(*this, OnDisabledMessageChanged(kDisabledMessage1)).Times(1);
+  SetDeviceDisabled(true);
+}
+
+// Verifies that the HonorDeviceDisablingDuringNormalOperation() method returns
+// true iff the device is enterprise enrolled and device disabling is not turned
+// off by flag.
+TEST_F(DeviceDisablingManagerTest, HonorDeviceDisablingDuringNormalOperation) {
+  // Not enterprise owned, not disabled by flag.
+  EXPECT_FALSE(
+      DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation());
+
+  // Enterprise owned, not disabled by flag.
+  SetEnterpriseOwned();
+  EXPECT_TRUE(
+      DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation());
+
+  // Enterprise owned, disabled by flag.
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kDisableDeviceDisabling);
+  EXPECT_FALSE(
+      DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation());
+
+  // Not enterprise owned, disabled by flag.
+  SetUnowned();
+  EXPECT_FALSE(
+      DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation());
 }
 
 }  // namespace system