More base::Values-related bare pointer -> scoped_ptr conversions

media/base/video_frame_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/callback_helpers.h"
 #include "base/format_macros.h"
 #include "base/memory/aligned_memory.h"
@@ skipping 368 matching lines @@
 
     EXPECT_FALSE(metadata.HasKey(key));
     metadata.SetTimeTicks(key, base::TimeTicks::FromInternalValue(~(0LL) + i));
     EXPECT_TRUE(metadata.HasKey(key));
     base::TimeTicks ticks_value;
     EXPECT_TRUE(metadata.GetTimeTicks(key, &ticks_value));
     EXPECT_EQ(base::TimeTicks::FromInternalValue(~(0LL) + i), ticks_value);
     metadata.Clear();
 
     EXPECT_FALSE(metadata.HasKey(key));
-    metadata.SetValue(key,
-                      scoped_ptr<base::Value>(base::Value::CreateNullValue()));
+    metadata.SetValue(key, base::Value::CreateNullValue());
     EXPECT_TRUE(metadata.HasKey(key));
     const base::Value* const null_value = metadata.GetValue(key);
     EXPECT_TRUE(null_value);
     EXPECT_EQ(base::Value::TYPE_NULL, null_value->GetType());
     metadata.Clear();
   }
 }
 
 TEST(VideoFrameMetadata, PassMetadataViaIntermediary) {
   VideoFrameMetadata expected;
@@ skipping 11 matching lines @@
 
   for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) {
     const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i);
     int value = -1;
     EXPECT_TRUE(result.GetInteger(key, &value));
     EXPECT_EQ(i, value);
   }
 }
 
 }  // namespace media