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

This CL nukes the usage of mojo::String and mojo::Array<> after [1],
so where it was mojo::String it now reads std::string or WTF::String
and also mojo::Array<> is replaced with std::vector or WTF::Vector,
as appropriate.

[1] https://groups.google.com/a/chromium.org/forum/?utm_medium=email&utm_source=footer#!msg/chromium-mojo/2SHvKyahLGg/sU61P0IIBgAJ

BUG=624136, 518807

TBR=xhwang@chromium.org
for the trivial change in media/mojo/interfaces/BUILD.gn

Review-Url: https://codereview.chromium.org/2166713002
Cr-Commit-Position: refs/heads/master@{#406776}

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))));
 }
 
 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);
 

content/browser/media/capture/image_capture_impl.h

@@ -7,7 +7,6 @@
 
 #include "media/mojo/interfaces/image_capture.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace content {
@@ -18,14 +17,14 @@ class ImageCaptureImpl : public media::mojom::ImageCapture {
       mojo::InterfaceRequest<media::mojom::ImageCapture> request);
   ~ImageCaptureImpl() override;
 
-  void GetCapabilities(const mojo::String& source_id,
+  void GetCapabilities(const std::string& source_id,
                        const GetCapabilitiesCallback& callback) override;
 
-  void SetOptions(const mojo::String& source_id,
+  void SetOptions(const std::string& source_id,
                   media::mojom::PhotoSettingsPtr settings,
                   const SetOptionsCallback& callback) override;
 
-  void TakePhoto(const mojo::String& source_id,
+  void TakePhoto(const std::string& source_id,
                  const TakePhotoCallback& callback) override;
 
  private:

media/capture/video/android/video_capture_device_android.cc

@@ -14,7 +14,6 @@
 #include "jni/VideoCapture_jni.h"
 #include "media/capture/video/android/photo_capabilities.h"
 #include "media/capture/video/android/video_capture_device_factory_android.h"
-#include "mojo/public/cpp/bindings/string.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
@@ -263,8 +262,7 @@ void VideoCaptureDeviceAndroid::OnPhotoTaken(
   std::vector<uint8_t> native_data;
   base::android::JavaByteArrayToByteVector(env, data.obj(), &native_data);
 
-  cb->Run(mojo::String::From(native_data.empty() ? "" : "image/jpeg"),
-          mojo::Array<uint8_t>::From(native_data));
+  cb->Run(std::string(native_data.empty() ? "" : "image/jpeg"), native_data);
 
   photo_callbacks_.erase(reference_it);
 }

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("image/png", encoded_data);
 }
 
 FakeVideoCaptureDevice::FakeVideoCaptureDevice(BufferOwnership buffer_ownership,

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>;

media/capture/video/mac/video_capture_device_mac.mm

@@ -444,9 +444,8 @@ void VideoCaptureDeviceMac::OnPhotoTaken(const uint8_t* image_data,
     return;
   }
 
-  photo_callback_->Run(mojo::String::From(mime_type),
-                       mojo::Array<uint8_t>(std::vector<uint8_t>(
-                           image_data, image_data + image_length)));
+  photo_callback_->Run(
+      mime_type, std::vector<uint8_t>(image_data, image_data + image_length));
   photo_callback_.reset();
 }
 

media/capture/video/video_capture_device.h

@@ -326,7 +326,7 @@ class CAPTURE_EXPORT VideoCaptureDevice {
   // and/or interrupting the capture flow. Runs |callback| on the thread
   // where TakePhoto() is called, if the photo was successfully taken.
   using TakePhotoCallback = ScopedResultCallback<
-      base::Callback<void(mojo::String, mojo::Array<uint8_t>)>>;
+      base::Callback<void(const std::string&, const std::vector<uint8_t>&)>>;
   virtual void TakePhoto(TakePhotoCallback callback);
 
   // Gets the power line frequency, either from the params if specified by the

media/capture/video/video_capture_device_unittest.cc

@@ -145,8 +145,9 @@ 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(mojo::String mime_type, mojo::Array<uint8_t> data) {
-    EXPECT_STREQ("image/jpeg", mime_type.storage().c_str());
+  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);
     // Check some bytes that univocally identify |data| as a JPEG File.
     // https://en.wikipedia.org/wiki/JPEG_File_Interchange_Format#File_format_structure
@@ -157,9 +158,9 @@ class MockImageCaptureClient : public base::RefCounted<MockImageCaptureClient> {
     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<MockImageCaptureClient>;

media/mojo/interfaces/BUILD.gn

@@ -39,6 +39,4 @@ mojom("image_capture") {
   sources = [
     "image_capture.mojom",
   ]
-
-  use_new_wrapper_types = false
 }

media/mojo/interfaces/mojo_bindings.gyp

@@ -85,9 +85,6 @@
       'sources': [
         'image_capture.mojom',
       ],
-      'variables': {
-        'use_new_wrapper_types': 'false',
-      },
     },
     {
       # GN version: //media/mojo/interfaces:image_capture
@@ -95,7 +92,6 @@
       'type': 'static_library',
       'variables': {
         'for_blink': 'true',
-        'use_new_wrapper_types': 'false',
       },
       'includes': [
         '../../../mojo/mojom_bindings_generator.gypi',

third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

@@ -218,17 +218,15 @@ void ImageCapture::onSetOptions(ScriptPromiseResolver* resolver, bool result)
     m_serviceRequests.remove(resolver);
 }
 
-void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mimeType, mojo::WTFArray<uint8_t> data)
+void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mimeType, const Vector<uint8_t>& data)
 {
     if (!m_serviceRequests.contains(resolver))
         return;
 
-    if (data.is_null() || data.empty()) {
+    if (data.isEmpty())
         resolver->reject(DOMException::create(UnknownError, "platform error"));
-    } else {
-        const auto& storage = data.storage();
-        resolver->resolve(Blob::create(storage.data(), storage.size(), mimeType));
-    }
+    else
+        resolver->resolve(Blob::create(data.data(), data.size(), mimeType));
     m_serviceRequests.remove(resolver);
 }
 

third_party/WebKit/Source/modules/imagecapture/ImageCapture.h

@@ -61,7 +61,7 @@ private:
 
     void onCapabilities(ScriptPromiseResolver*, media::mojom::blink::PhotoCapabilitiesPtr);
     void onSetOptions(ScriptPromiseResolver*, bool);
-    void onTakePhoto(ScriptPromiseResolver*, const String& mimeType, mojo::WTFArray<uint8_t> data);
+    void onTakePhoto(ScriptPromiseResolver*, const String& mimeType, const Vector<uint8_t>& data);
     void onServiceConnectionError();
 
     Member<MediaStreamTrack> m_streamTrack;