Delete DownloadActionDelegate::SetDownloadStatus() method.
This method is only used by the caller to detect a programming error in
the DownloadAction (calling BytesReceived when not downloading) and log
a message. This patch removes the method from the delegate interface
and makes sure it doesn't issue a call to BytesReceived when not
activelly downloading.
Bug: 25773375
TEST=FEATURES=test emerge-link update_engine
Change-Id: I8ff5c53f1fd40c0777b3f6523703a8bee71c019d
diff --git a/payload_consumer/download_action_unittest.cc b/payload_consumer/download_action_unittest.cc
index 3bef196..901dbd6 100644
--- a/payload_consumer/download_action_unittest.cc
+++ b/payload_consumer/download_action_unittest.cc
@@ -62,7 +62,6 @@
namespace {
class DownloadActionDelegateMock : public DownloadActionDelegate {
public:
- MOCK_METHOD1(SetDownloadStatus, void(bool active));
MOCK_METHOD2(BytesReceived, void(uint64_t bytes_received, uint64_t total));
};
@@ -177,12 +176,10 @@
if (use_download_delegate) {
InSequence s;
download_action.set_delegate(&download_delegate);
- EXPECT_CALL(download_delegate, SetDownloadStatus(true)).Times(1);
if (data.size() > kMockHttpFetcherChunkSize)
EXPECT_CALL(download_delegate,
BytesReceived(1 + kMockHttpFetcherChunkSize, _));
EXPECT_CALL(download_delegate, BytesReceived(_, _)).Times(AtLeast(1));
- EXPECT_CALL(download_delegate, SetDownloadStatus(false)).Times(1);
}
ErrorCode expected_code = ErrorCode::kSuccess;
if (fail_write > 0)
@@ -291,10 +288,8 @@
download_action.SetTestFileWriter(&writer);
DownloadActionDelegateMock download_delegate;
if (use_download_delegate) {
- InSequence s;
download_action.set_delegate(&download_delegate);
- EXPECT_CALL(download_delegate, SetDownloadStatus(true)).Times(1);
- EXPECT_CALL(download_delegate, SetDownloadStatus(false)).Times(1);
+ EXPECT_CALL(download_delegate, BytesReceived(_, _)).Times(0);
}
TerminateEarlyTestProcessorDelegate delegate;
ActionProcessor processor;