| 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 d090e331af8363c5111081a1d55bb208bacfe041..d884daf959c22bc0eec4b95c95c57c412c737948 100644
|
| --- a/media/capture/video/fake_video_capture_device_unittest.cc
|
| +++ b/media/capture/video/fake_video_capture_device_unittest.cc
|
| @@ -21,7 +21,6 @@
|
| #include "media/base/video_capture_types.h"
|
| #include "media/capture/video/fake_video_capture_device_factory.h"
|
| #include "media/capture/video/video_capture_device.h"
|
| -#include "mojo/public/cpp/bindings/string.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -152,9 +151,10 @@ 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(mojo::String mime_type, mojo::Array<uint8_t> data) {
|
| + void DoOnPhotoTaken(const std::string& mime_type,
|
| + const std::vector<uint8_t>& data) {
|
| // Only PNG images are supported right now.
|
| - EXPECT_STREQ("image/png", mime_type.storage().c_str());
|
| + EXPECT_STREQ("image/png", 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);
|
| @@ -164,9 +164,9 @@ class ImageCaptureClient : public base::RefCounted<ImageCaptureClient> {
|
| OnCorrectPhotoTaken();
|
| }
|
| MOCK_METHOD0(OnCorrectPhotoTaken, void(void));
|
| - MOCK_METHOD1(
|
| - OnTakePhotoFailure,
|
| - void(const base::Callback<void(mojo::String, mojo::Array<uint8_t>)>&));
|
| + MOCK_METHOD1(OnTakePhotoFailure,
|
| + void(const base::Callback<void(const std::string&,
|
| + const std::vector<uint8_t>&)>&));
|
|
|
| private:
|
| friend class base::RefCounted<ImageCaptureClient>;
|
|
|