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

chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc

 // Copyright 2014 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 "chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 100 matching lines @@
   void SetUp() override {
     PreferenceValidationDelegateTest::SetUp();
     value_type_ = std::tr1::get<0>(GetParam());
     expected_value_ = std::tr1::get<1>(GetParam());
   }
 
   static scoped_ptr<base::Value> MakeValue(base::Value::Type value_type) {
     using base::Value;
     switch (value_type) {
       case Value::TYPE_NULL:
-        return make_scoped_ptr(Value::CreateNullValue());
+        return Value::CreateNullValue();
       case Value::TYPE_BOOLEAN:
         return scoped_ptr<Value>(new base::FundamentalValue(false));
       case Value::TYPE_INTEGER:
         return scoped_ptr<Value>(new base::FundamentalValue(47));
       case Value::TYPE_DOUBLE:
         return scoped_ptr<Value>(new base::FundamentalValue(0.47));
       case Value::TYPE_STRING:
         return scoped_ptr<Value>(new base::StringValue("i have a spleen"));
       case Value::TYPE_DICTIONARY: {
         scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
@@ skipping 148 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     WithIncident,
     PreferenceValidationDelegateWithIncident,
     testing::Combine(
         testing::Values(PrefHashStoreTransaction::CLEARED,
                         PrefHashStoreTransaction::CHANGED,
                         PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE),
         testing::Bool()));