Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

1 files changed, 8 insertions, 8 deletions

diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index 18cc1d3dd3..ce4869c157 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "media/base/buffers.h"
 #include "media/base/yuv_convert.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -93,7 +93,7 @@ void ExpectFrameExtents(VideoFrame::Format format, int planes,
   gfx::Size size(kWidth, kHeight);
   scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame(
       format, size, gfx::Rect(size), size, kTimestamp);
-  ASSERT_TRUE(frame);
+  ASSERT_TRUE(frame.get());
 
   for(int plane = 0; plane < planes; plane++) {
     SCOPED_TRACE(base::StringPrintf("Checking plane %d", plane));
@@ -129,14 +129,14 @@ TEST(VideoFrame, CreateFrame) {
   scoped_refptr<media::VideoFrame> frame =
       VideoFrame::CreateFrame(media::VideoFrame::YV12, size, gfx::Rect(size),
                               size, kTimestamp);
-  ASSERT_TRUE(frame);
+  ASSERT_TRUE(frame.get());
 
   // Test VideoFrame implementation.
   EXPECT_EQ(media::VideoFrame::YV12, frame->format());
   {
     SCOPED_TRACE("");
-    InitializeYV12Frame(frame, 0.0f);
-    ExpectFrameColor(frame, 0xFF000000);
+    InitializeYV12Frame(frame.get(), 0.0f);
+    ExpectFrameColor(frame.get(), 0xFF000000);
   }
   base::MD5Digest digest;
   base::MD5Context context;
@@ -146,8 +146,8 @@ TEST(VideoFrame, CreateFrame) {
   EXPECT_EQ(MD5DigestToBase16(digest), "9065c841d9fca49186ef8b4ef547e79b");
   {
     SCOPED_TRACE("");
-    InitializeYV12Frame(frame, 1.0f);
-    ExpectFrameColor(frame, 0xFFFFFFFF);
+    InitializeYV12Frame(frame.get(), 1.0f);
+    ExpectFrameColor(frame.get(), 0xFFFFFFFF);
   }
   base::MD5Init(&context);
   frame->HashFrameForTesting(&context);
@@ -167,7 +167,7 @@ TEST(VideoFrame, CreateBlackFrame) {
 
   scoped_refptr<media::VideoFrame> frame =
       VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight));
-  ASSERT_TRUE(frame);
+  ASSERT_TRUE(frame.get());
 
   // Test basic properties.
   EXPECT_EQ(0, frame->GetTimestamp().InMicroseconds());