ImageCapture: replace Mojo String/Array with stl/wtf string/vector

content/browser/media/capture/image_capture_impl.cc

Index: content/browser/media/capture/image_capture_impl.cc
diff --git a/content/browser/media/capture/image_capture_impl.cc b/content/browser/media/capture/image_capture_impl.cc
index 23da723eae8c78bb4712bab3a4267c42f9aad6f5..9941b7b4decdd3e8a8db3959b6cd72fad3d624d6 100644
--- a/content/browser/media/capture/image_capture_impl.cc
+++ b/content/browser/media/capture/image_capture_impl.cc
@@ -51,20 +51,23 @@ void RunFailedSetOptionsCallback(
 
 void RunTakePhotoCallbackOnUIThread(
     const ImageCaptureImpl::TakePhotoCallback& callback,
-    mojo::String mime_type,
-    mojo::Array<uint8_t> data) {
+    const std::string& mime_type,
+    const std::vector<uint8_t>& data) {
+  // TODO(mcasas): Use a mojo typemapping instead of const_cast to avoid copying
+  // |data|, https://crbug.com/630040.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(callback, mime_type, base::Passed(std::move(data))));
+      base::Bind(callback, mime_type,
+                 base::Passed(const_cast<std::vector<uint8_t>*>(&data))));

[Wez, 2016/07/21 00:10:46]

nit: I take it it's not possible to have this work with std::move in some way?

[mcasas, 2016/07/21 00:25:57]

It's too complicated. TBH let's commit this first,
knowing that I'll be working imminently on its
sequel (fret not, you'll review it) and that all 
ImageCapture related code is behind a flag
(and the bug for introducing TypeMapping is
blocking the larger ImageCapture one).

You could siphon off the memory inside |data| 
into a newly allocated std::unique_ptr<> that 
is then base::Passed(std::move()) into the 
base::Callback, but, again, not worth it.

 }
 
 void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  cb.Run("", mojo::Array<uint8_t>());
+  cb.Run("", std::vector<uint8_t>());
 }
 
 void GetCapabilitiesOnIOThread(
-    const mojo::String& source_id,
+    const std::string& source_id,
     MediaStreamManager* media_stream_manager,
     media::ScopedResultCallback<ImageCaptureImpl::GetCapabilitiesCallback>
         callback) {
@@ -80,7 +83,7 @@ void GetCapabilitiesOnIOThread(
 }
 
 void SetOptionsOnIOThread(
-    const mojo::String& source_id,
+    const std::string& source_id,
     MediaStreamManager* media_stream_manager,
     media::mojom::PhotoSettingsPtr settings,
     media::ScopedResultCallback<ImageCaptureImpl::SetOptionsCallback>
@@ -97,7 +100,7 @@ void SetOptionsOnIOThread(
 }
 
 void TakePhotoOnIOThread(
-    const mojo::String& source_id,
+    const std::string& source_id,
     MediaStreamManager* media_stream_manager,
     media::ScopedResultCallback<ImageCaptureImpl::TakePhotoCallback> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -123,7 +126,7 @@ void ImageCaptureImpl::Create(
 ImageCaptureImpl::~ImageCaptureImpl() {}
 
 void ImageCaptureImpl::GetCapabilities(
-    const mojo::String& source_id,
+    const std::string& source_id,
     const GetCapabilitiesCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -138,7 +141,7 @@ void ImageCaptureImpl::GetCapabilities(
                  base::Passed(&scoped_callback)));
 }
 
-void ImageCaptureImpl::SetOptions(const mojo::String& source_id,
+void ImageCaptureImpl::SetOptions(const std::string& source_id,
                                   media::mojom::PhotoSettingsPtr settings,
                                   const SetOptionsCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -154,7 +157,7 @@ void ImageCaptureImpl::SetOptions(const mojo::String& source_id,
                  base::Passed(&settings), base::Passed(&scoped_callback)));
 }
 
-void ImageCaptureImpl::TakePhoto(const mojo::String& source_id,
+void ImageCaptureImpl::TakePhoto(const std::string& source_id,
                                  const TakePhotoCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);