Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(924)

Unified Diff: media/capture/video/fake_video_capture_device_unittest.cc

Issue 2167313002: ImageCapture: introduce image_capture Blob to allow move-only semantics (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: foolip comments and rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/capture/video/fake_video_capture_device_unittest.cc
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index 9eb5c357bbcad5cc09059bc35ee7b135e27dd57d..931c0f9807f5055f82fde2a7c0be4bb298e37c94 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -151,22 +151,20 @@ class ImageCaptureClient : public base::RefCounted<ImageCaptureClient> {
void(const base::Callback<void(bool)>&));
// GMock doesn't support move-only arguments, so we use this forward method.
- void DoOnPhotoTaken(const std::string& mime_type,
- const std::vector<uint8_t>& data) {
+ void DoOnPhotoTaken(mojom::BlobPtr blob) {
// Only PNG images are supported right now.
- EXPECT_STREQ("image/png", mime_type.c_str());
+ EXPECT_STREQ("image/png", blob->mime_type.c_str());
// Not worth decoding the incoming data. Just check that the header is PNG.
// http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature
- ASSERT_GT(data.size(), 4u);
- EXPECT_EQ('P', data[1]);
- EXPECT_EQ('N', data[2]);
- EXPECT_EQ('G', data[3]);
+ ASSERT_GT(blob->data.size(), 4u);
+ EXPECT_EQ('P', blob->data[1]);
+ EXPECT_EQ('N', blob->data[2]);
+ EXPECT_EQ('G', blob->data[3]);
OnCorrectPhotoTaken();
}
MOCK_METHOD0(OnCorrectPhotoTaken, void(void));
MOCK_METHOD1(OnTakePhotoFailure,
- void(const base::Callback<void(const std::string&,
- const std::vector<uint8_t>&)>&));
+ void(const base::Callback<void(mojom::BlobPtr)>&));
private:
friend class base::RefCounted<ImageCaptureClient>;
« no previous file with comments | « media/capture/video/fake_video_capture_device.cc ('k') | media/capture/video/mac/video_capture_device_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698