media/capture/video/fake_video_capture_device.cc - Issue 2166713002: ImageCapture: replace Mojo String/Array with stl/wtf string/vector

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2166713002: ImageCapture: replace Mojo String/Array with stl/wtf string/vector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« content/browser/media/capture/image_capture_impl.cc ('K') | « media/capture/video/android/video_capture_device_android.cc ('k') | media/capture/video/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/fake_video_capture_device.cc

diff --git a/media/capture/video/fake_video_capture_device.cc b/media/capture/video/fake_video_capture_device.cc

index a8f4dc3f35db9fc641d834033c462add25acad3c..3a5f98a8536e3bf877d101c37205008aea42f35f 100644

--- a/media/capture/video/fake_video_capture_device.cc

+++ b/media/capture/video/fake_video_capture_device.cc

@@ -108,8 +108,7 @@ void DoTakeFakePhoto(VideoCaptureDevice::TakePhotoCallback callback,

std::vector<gfx::PNGCodec::Comment>(), &encoded_data);

DCHECK(result);

- callback.Run(mojo::String::From("image/png"),

- mojo::Array<uint8_t>::From(encoded_data));

+ callback.Run(std::string("image/png"), encoded_data);

Wez 2016/07/20 18:52:07 nit: Do you need the explicit std::string here?

mcasas 2016/07/20 22:57:01 Nope, removed. It wouldn't hurt performance becaus

}

FakeVideoCaptureDevice::FakeVideoCaptureDevice(BufferOwnership buffer_ownership,