Revert of RELAND: ShapeDetection: use mojom::Bitmap for mojo interface.

services/shape_detection/face_detection_impl_mac_unittest.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/shape_detection/face_detection_impl_mac.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/run_loop.h"
@@ skipping 58 matching lines @@
       reinterpret_cast<const uint8_t*>(image_as_jpeg.data()),
       image_as_jpeg.size());
   ASSERT_TRUE(image);
   ASSERT_EQ(kJpegImageWidth, image->width());
   ASSERT_EQ(kJpegImageHeight, image->height());
 
   const gfx::Size size(image->width(), image->height());
   const int num_bytes = size.GetArea() * 4 /* bytes per pixel */;
   ASSERT_EQ(num_bytes, image->computeSize64());
 
+  // Generate a new ScopedSharedBufferHandle of the aproppriate size, map it and
+  // copy the image pixels into it.
+  mojo::ScopedSharedBufferHandle handle =
+      mojo::SharedBufferHandle::Create(num_bytes);
+  ASSERT_TRUE(handle->is_valid());
+
+  mojo::ScopedSharedBufferMapping mapping = handle->Map(num_bytes);
+  ASSERT_TRUE(mapping);
+
+  memcpy(mapping.get(), image->getPixels(), num_bytes);
+
   base::RunLoop run_loop;
   base::Closure quit_closure = run_loop.QuitClosure();
   // Send the image to Detect() and expect the response in callback.
   EXPECT_CALL(*this, Detection(1)).WillOnce(RunClosure(quit_closure));
-  impl_->Detect(*image, base::Bind(&FaceDetectionImplMacTest::DetectCallback,
-                                   base::Unretained(this)));
+  impl_->Detect(std::move(handle), size.width(), size.height(),
+                base::Bind(&FaceDetectionImplMacTest::DetectCallback,
+                           base::Unretained(this)));
 
   run_loop.Run();
 }
 
 INSTANTIATE_TEST_CASE_P(, FaceDetectionImplMacTest, ValuesIn({true, false}));
 
 }  // shape_detection namespace