commit 5708ecdc44ed0b78a72d5605d691476fd9907778
author Alex Deymo <deymo@chromium.org> Tue Apr 29 19:44:50 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Apr 30 12:41:16 2014 +0000
tree 32ca0ca1c4918973000dbd0c48e888ead98f6c26
parent af2f6ae066a8117113f6ff3d112c8d00eb5d8c67

Move IsBootDeviceRemovable() to the HardwareInterface.

The UpdateCheckScheduler class had a IsBootDeviceRemovable method to
mock out the value during testing of that class. Instead, this patch
uses the HardwareInterface to mock out that value.

BUG=chromium:358269
TEST=Unittests updated.

Change-Id: Ib20f70fa0468aaa4bc8bb1b674084bd9a61e5085
Reviewed-on: https://chromium-review.googlesource.com/197598
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>

mock_hardware.h

diff --git a/mock_hardware.h b/mock_hardware.h
index a996896..574f1f7 100644
--- a/mock_hardware.h
+++ b/mock_hardware.h
@@ -22,6 +22,9 @@
     ON_CALL(*this, BootDevice())
       .WillByDefault(testing::Invoke(&fake_,
             &FakeHardware::BootDevice));
+    ON_CALL(*this, IsBootDeviceRemovable())
+      .WillByDefault(testing::Invoke(&fake_,
+            &FakeHardware::IsBootDeviceRemovable));
     ON_CALL(*this, GetKernelDevices())
       .WillByDefault(testing::Invoke(&fake_,
             &FakeHardware::GetKernelDevices));
@@ -56,6 +59,7 @@
   // Hardware overrides.
   MOCK_CONST_METHOD0(BootKernelDevice, std::string());
   MOCK_CONST_METHOD0(BootDevice, std::string());
+  MOCK_CONST_METHOD0(IsBootDeviceRemovable, bool());
   MOCK_CONST_METHOD0(GetKernelDevices, std::vector<std::string>());
   MOCK_CONST_METHOD2(IsKernelBootable,
                bool(const std::string& kernel_device, bool* bootable));