update_engine: replace std::vector<char> with chromeos::Blob
To make update engine consistent with the rest of platform2 code
replaced std::vector<char> as the container of binary data with
chromeos::Blob.
BUG=None
TEST=`FEATURES=test emerge-link update_engine`
Change-Id: I6385fd2257d15aa24bfa74ac35512c2a06c33012
Reviewed-on: https://chromium-review.googlesource.com/247793
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/mock_http_fetcher.h b/mock_http_fetcher.h
index b9d7cd7..c97eeb3 100644
--- a/mock_http_fetcher.h
+++ b/mock_http_fetcher.h
@@ -31,7 +31,7 @@
public:
// The data passed in here is copied and then passed to the delegate after
// the transfer begins.
- MockHttpFetcher(const char* data,
+ MockHttpFetcher(const uint8_t* data,
size_t size,
ProxyResolver* proxy_resolver)
: HttpFetcher(proxy_resolver, &fake_system_state_),
@@ -46,6 +46,11 @@
data_.insert(data_.end(), data, data + size);
}
+ // Constructor overload for string data.
+ MockHttpFetcher(const char* data, size_t size, ProxyResolver* proxy_resolver)
+ : MockHttpFetcher(reinterpret_cast<const uint8_t*>(data), size,
+ proxy_resolver) {}
+
// Cleans up all internal state. Does not notify delegate
~MockHttpFetcher() override;
@@ -87,7 +92,7 @@
// If set to true, this will EXPECT fail on BeginTransfer
void set_never_use(bool never_use) { never_use_ = never_use; }
- const std::vector<char>& post_data() const {
+ const chromeos::Blob& post_data() const {
return post_data_;
}
@@ -111,7 +116,7 @@
void SignalTransferComplete();
// A full copy of the data we'll return to the delegate
- std::vector<char> data_;
+ chromeos::Blob data_;
// The number of bytes we've sent so far
size_t sent_size_;