Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline.

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

Index: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index 856f53222d0f1e66faadfde84ccf99f28771999b..c4293b59ea17c3a2a5c1e3ec388bd7ef2e6e760e 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -30,7 +30,6 @@ struct PixelFormatAndStorage {
 static const PixelFormatAndStorage kCapturePixelFormatAndStorages[] = {
     {media::PIXEL_FORMAT_I420, media::PIXEL_STORAGE_CPU},
     {media::PIXEL_FORMAT_ARGB, media::PIXEL_STORAGE_CPU},

[mcasas, 2015/11/13 19:13:57]

At the level of VCBP,  CPU storage should support all formats,
whereas GMB only is intended for I420. ARGB was explicited
here for Texture. I wonder if we could reflect that in these test
parameters?  Either that, or add provisions in 
VCBP::SharedMemTracker::Init() to limit it to I420.

Unclear to me, since now we support more than what we use
(VideoCaptureDeviceClient should only use I420 now).

[miu, 2015/11/14 03:43:47]

Good questions.  A few points:

1. There's nothing extra needed for the buffer pool to support ANY pixel format
(for the SHMEM case).  So, it's probably too pedantic to purposely exclude any.

2. Code that uses the buffer pool already stringently checks for I420 format, so
there's no risk of unintended use.

3. We should consider whether I420 should be the only supported format.  I know
of efforts where people would, for example, love to have I444 support to
eliminate color bleeding problems for certain applications.

So, I'll leave the ARGB+STORAGE_CPU case in-place for these tests for now.

-    {media::PIXEL_FORMAT_ARGB, media::PIXEL_STORAGE_TEXTURE},
 #if !defined(OS_ANDROID)
     {media::PIXEL_FORMAT_I420,
      media::PIXEL_STORAGE_GPUMEMORYBUFFER},
@@ -225,12 +224,10 @@ TEST_P(VideoCaptureBufferPoolTest, BufferPool) {
     ASSERT_LE(format_lo.ImageAllocationSize(), buffer3->mapped_size());
   }
 
-  // Texture backed Frames cannot be manipulated via mapping.
-  if (GetParam().pixel_storage != media::PIXEL_STORAGE_TEXTURE) {
-    ASSERT_NE(nullptr, buffer1->data());
-    ASSERT_NE(nullptr, buffer2->data());
-    ASSERT_NE(nullptr, buffer3->data());
-  }
+  ASSERT_NE(nullptr, buffer1->data());
+  ASSERT_NE(nullptr, buffer2->data());
+  ASSERT_NE(nullptr, buffer3->data());
+
   // Touch the memory.
   if (buffer1->data() != nullptr)
     memset(buffer1->data(), 0x11, buffer1->mapped_size());