Revert everything related to the relanding.

media/base/video_frame_unittest.cc

 // Copyright (c) 2010 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/base/video_frame.h"
 
 #include "base/format_macros.h"
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "media/base/buffers.h"
 #include "media/base/mock_filters.h"
 #include "media/base/yuv_convert.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // Helper function that initializes a YV12 frame with white and black scan
 // lines based on the |white_to_black| parameter.  If 0, then the entire
@@ skipping 191 matching lines @@
   // Test frame properties.
   EXPECT_EQ(1, frame->stride(VideoFrame::kRGBPlane));
   EXPECT_EQ(memory.get(), frame->data(VideoFrame::kRGBPlane));
 
   // Delete |memory| and then |frame|.
   memory.reset();
   frame = NULL;
 }
 
 }  // namespace media