ImageCapture: Implement TakePhoto() for Linux/CrOs

media/capture/video/video_capture_device_unittest.cc

 // Copyright (c) 2012 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 "media/capture/video/video_capture_device.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 45 matching lines @@
 #define MAYBE_AllocateBadSize AllocateBadSize
 #define MAYBE_CaptureMjpeg CaptureMjpeg
 #define MAYBE_TakePhoto DISABLED_TakePhoto
 #elif defined(OS_LINUX)
 // AllocateBadSize will hang when a real camera is attached and if more than one
 // test is trying to use the camera (even across processes). Do NOT renable
 // this test without fixing the many bugs associated with it:
 // http://crbug.com/94134 http://crbug.com/137260 http://crbug.com/417824
 #define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
 #define MAYBE_CaptureMjpeg CaptureMjpeg
-#define MAYBE_TakePhoto DISABLED_TakePhoto
+#define MAYBE_TakePhoto TakePhoto
 #else
 #define MAYBE_AllocateBadSize AllocateBadSize
 #define MAYBE_CaptureMjpeg CaptureMjpeg
 #define MAYBE_TakePhoto DISABLED_TakePhoto
 #endif
 
 using ::testing::_;
+using ::testing::AnyOf;

[mcasas, 2016/09/16 03:50:37]

Not used, remove.

[xianglu, 2016/09/16 18:22:34]

Done.

 using ::testing::SaveArg;
 
 namespace media {
 namespace {
 
 class MockVideoCaptureClient : public VideoCaptureDevice::Client {
  public:
   MOCK_METHOD0(DoReserveOutputBuffer, void(void));
   MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
   MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
@@ skipping 50 matching lines @@
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
   base::Callback<void(const VideoCaptureFormat&)> frame_cb_;
 };
 
 class MockImageCaptureClient : public base::RefCounted<MockImageCaptureClient> {
  public:
   // GMock doesn't support move-only arguments, so we use this forward method.
   void DoOnPhotoTaken(mojom::BlobPtr blob) {
-    EXPECT_STREQ("image/jpeg", blob->mime_type.c_str());
-    ASSERT_GT(blob->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
-    EXPECT_EQ(0xFF, blob->data[0]);  // First SOI byte
-    EXPECT_EQ(0xD8, blob->data[1]);  // Second SOI byte
-    EXPECT_EQ(0xFF, blob->data[2]);  // First JFIF-APP0 byte
-    EXPECT_EQ(0xE0, blob->data[3]);  // Second JFIF-APP0 byte
-    OnCorrectPhotoTaken();
+    if (strcmp("image/jpeg", blob->mime_type.c_str()) == 0) {
+      ASSERT_GT(blob->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
+      EXPECT_EQ(0xFF, blob->data[0]);  // First SOI byte
+      EXPECT_EQ(0xD8, blob->data[1]);  // Second SOI byte
+      EXPECT_EQ(0xFF, blob->data[2]);  // First JFIF-APP0 byte
+      EXPECT_EQ(0xE0, blob->data[3]);  // Second JFIF-APP0 byte
+      OnCorrectPhotoTaken();
+    } else if (strcmp("image/png", blob->mime_type.c_str()) == 0) {
+      ASSERT_GT(blob->data.size(), 4u);
+      EXPECT_EQ('P', blob->data[1]);
+      EXPECT_EQ('N', blob->data[2]);
+      EXPECT_EQ('G', blob->data[3]);
+      OnCorrectPhotoTaken();
+    } else {
+      NOTREACHED() << "Photo format should be jpeg or png";

[mcasas, 2016/09/16 03:50:37]

NOTREACHED() would crash the test executable and
prevent other tests from running. Instead, use
FAIL() or ADD_FAILURE():
https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...

[xianglu, 2016/09/16 18:22:34]

Done.

+    }
   }
   MOCK_METHOD0(OnCorrectPhotoTaken, void(void));
   MOCK_METHOD1(OnTakePhotoFailure,
                void(const base::Callback<void(mojom::BlobPtr)>&));
 
  private:
   friend class base::RefCounted<MockImageCaptureClient>;
   virtual ~MockImageCaptureClient() {}
 };
 
@@ skipping 367 matching lines @@
           &MockImageCaptureClient::OnTakePhotoFailure, image_capture_client_)));
 
   EXPECT_CALL(*image_capture_client_.get(), OnCorrectPhotoTaken()).Times(1);
   device->TakePhoto(std::move(scoped_callback));
   WaitForCapturedFrame();
 
   device->StopAndDeAllocate();
 }
 
 };  // namespace media