Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat.

content/browser/media/media_internals_unittest.cc

Index: content/browser/media/media_internals_unittest.cc
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc
index 1f5640332108749dbccb3f74dc19b78bf27fda3a..b7b813079420474243ba7bc0d2554d38c7f58cfc 100644
--- a/content/browser/media/media_internals_unittest.cc
+++ b/content/browser/media/media_internals_unittest.cc
@@ -152,14 +152,14 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
   const float kFrameRate = 30.0f;
   const gfx::Size kFrameSize(1280, 720);
   const media::VideoPixelFormat kPixelFormat = media::PIXEL_FORMAT_I420;
+  const media::VideoPixelStorage kPixelStorage = media::PIXEL_STORAGE_CPU;
   const media::VideoCaptureFormat capture_format(
-      kFrameSize, kFrameRate, kPixelFormat);
-  const std::string expected_string =
-      base::StringPrintf("resolution: %s, fps: %.3f, pixel format: %s",
-                         kFrameSize.ToString().c_str(),
-                         kFrameRate,
-                         media::VideoCaptureFormat::PixelFormatToString(
-                              kPixelFormat).c_str());
+      kFrameSize, kFrameRate, kPixelFormat, kPixelStorage);
+  const std::string expected_string = base::StringPrintf(
+      "(%s)@%.3ffps, pixel format: %s storage: %s.",
+      kFrameSize.ToString().c_str(), kFrameRate,
+      media::VideoCaptureFormat::PixelFormatToString(kPixelFormat).c_str(),
+      media::VideoCaptureFormat::PixelStorageToString(kPixelStorage).c_str());
   EXPECT_EQ(expected_string, capture_format.ToString());
 }