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

Unified Diff: media/capture/video/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
« no previous file with comments | « media/capture/video/video_capture_device.h ('k') | media/mojo/interfaces/image_capture.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/video_capture_device_unittest.cc
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
index b1b4644515d338765d07483ea5005404f0282c7f..991e9a5fa855b3002f0693eb4dddbda44adaf627 100644
--- a/media/capture/video/video_capture_device_unittest.cc
+++ b/media/capture/video/video_capture_device_unittest.cc
@@ -145,22 +145,20 @@ class MockVideoCaptureClient : public VideoCaptureDevice::Client {
class MockImageCaptureClient : public base::RefCounted<MockImageCaptureClient> {
public:
// 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) {
- EXPECT_STREQ("image/jpeg", mime_type.c_str());
- ASSERT_GT(data.size(), 4u);
+ void DoOnPhotoTaken(mojom::BlobPtr blob) {
+ EXPECT_STREQ("image/jpeg", blob->mime_type.c_str());
+ ASSERT_GT(blob->data.size(), 4u);
// Check some bytes that univocally identify |data| as a JPEG File.
// https://en.wikipedia.org/wiki/JPEG_File_Interchange_Format#File_format_structure
- EXPECT_EQ(0xFF, data[0]); // First SOI byte
- EXPECT_EQ(0xD8, data[1]); // Second SOI byte
- EXPECT_EQ(0xFF, data[2]); // First JFIF-APP0 byte
- EXPECT_EQ(0xE0, data[3]); // Second JFIF-APP0 byte
+ EXPECT_EQ(0xFF, blob->data[0]); // First SOI byte
+ EXPECT_EQ(0xD8, blob->data[1]); // Second SOI byte
+ EXPECT_EQ(0xFF, blob->data[2]); // First JFIF-APP0 byte
+ EXPECT_EQ(0xE0, blob->data[3]); // Second JFIF-APP0 byte
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<MockImageCaptureClient>;
« no previous file with comments | « media/capture/video/video_capture_device.h ('k') | media/mojo/interfaces/image_capture.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698