WIP: Option2: Android media: VideoFrame should not store so many sync points.

content/browser/renderer_host/media/video_capture_controller_unittest.cc

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index f650397de7bfc0c59890c91a0ce7997e9caa29ec..f658aba9386fc1aa4adb9c2fa019d9b7f4a920e7 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -70,7 +70,7 @@ class MockVideoCaptureControllerEventHandler
                    id,
                    this,
                    buffer_id,
-                   std::vector<uint32>()));
+                   std::map<std::string, uint32>()));
   }
   virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id,
                                     int buffer_id,
@@ -79,8 +79,9 @@ class MockVideoCaptureControllerEventHandler
                                     base::TimeTicks timestamp) OVERRIDE {
     DoMailboxBufferReady(id);
     // Use a very different syncpoint value when returning a new syncpoint.
-    std::vector<uint32> release_sync_points;
-    release_sync_points.push_back(~mailbox_holder.sync_point);
+    std::map<std::string, uint32> release_sync_points;
+    release_sync_points["test1"] = ~mailbox_holder.sync_point;
+    release_sync_points["test2"] = mailbox_holder.sync_point;
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&VideoCaptureController::ReturnBuffer,
@@ -263,11 +264,18 @@ TEST_F(VideoCaptureControllerTest, AddAndRemoveClients) {
       << "Client count should return to zero after all clients are gone.";
 }
 
-static void CacheSyncPoint(std::vector<uint32>* called_release_sync_points,
-                           const std::vector<uint32>& release_sync_points) {
+static void CacheSyncPoint(
+    std::map<std::string, uint32>* called_release_sync_points,
+    const std::map<std::string, uint32>& release_sync_points) {
   DCHECK(called_release_sync_points->empty());
-  called_release_sync_points->assign(release_sync_points.begin(),
-                                     release_sync_points.end());
+  for (std::map<std::string, uint32>::const_iterator iter =
+           release_sync_points.begin();
+       iter != release_sync_points.end();
+       iter++) {
+    EXPECT_TRUE(called_release_sync_points->insert(std::make_pair(iter->first,
+                                                                  iter->second))
+                    .second);
+  }
 }
 
 // This test will connect and disconnect several clients while simulating an
@@ -484,12 +492,13 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
     buffer = NULL;
   }
   std::vector<uint32> mailbox_syncpoints(mailbox_buffers);
-  std::vector<std::vector<uint32> > release_syncpoint_vectors(mailbox_buffers);
+  std::vector<std::map<std::string, uint32> > release_syncpoint_vectors(
+      mailbox_buffers);
   for (int i = 0; i < mailbox_buffers; ++i) {
     buffer = device_->ReserveOutputBuffer(media::VideoFrame::NATIVE_TEXTURE,
                                           gfx::Size(0, 0));
     ASSERT_TRUE(buffer);
-    mailbox_syncpoints[i] = i;
+    mailbox_syncpoints[i] = i + 1;
     device_->OnIncomingCapturedVideoFrame(
         buffer,
         media::VideoCaptureFormat(capture_resolution,
@@ -516,8 +525,9 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   base::RunLoop().RunUntilIdle();
   for (size_t i = 0; i < mailbox_syncpoints.size(); ++i) {
     // See: MockVideoCaptureControllerEventHandler::OnMailboxBufferReady()
-    ASSERT_EQ(1u, release_syncpoint_vectors[i].size());
-    ASSERT_EQ(mailbox_syncpoints[i], ~release_syncpoint_vectors[i][0]);
+    ASSERT_EQ(2u, release_syncpoint_vectors[i].size());
+    ASSERT_EQ(mailbox_syncpoints[i], ~release_syncpoint_vectors[i].at("test1"));
+    ASSERT_EQ(mailbox_syncpoints[i], release_syncpoint_vectors[i].at("test2"));
   }
   Mock::VerifyAndClearExpectations(client_b_.get());
 }