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

components/json_schema/json_schema_validator_unittest_base.cc

 // Copyright 2013 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 "components/json_schema/json_schema_validator_unittest_base.h"
 
 #include <cfloat>
 #include <cmath>
 #include <limits>
 
@@ skipping 136 matching lines @@
   ExpectValid(TEST_SOURCE,
               scoped_ptr<base::Value>(new base::FundamentalValue(false)).get(),
               schema.get(), NULL);
 
   ExpectNotValid(TEST_SOURCE,
                  scoped_ptr<base::Value>(new base::StringValue("42")).get(),
                  schema.get(),
                  NULL,
                  std::string(),
                  JSONSchemaValidator::kInvalidEnum);
-  ExpectNotValid(TEST_SOURCE,
-                 scoped_ptr<base::Value>(base::Value::CreateNullValue()).get(),
-                 schema.get(),
-                 NULL,
-                 std::string(),
+  ExpectNotValid(TEST_SOURCE, base::Value::CreateNullValue().get(),
+                 schema.get(), NULL, std::string(),
                  JSONSchemaValidator::kInvalidEnum);
 }
 
 void JSONSchemaValidatorTestBase::TestChoices() {
   scoped_ptr<base::DictionaryValue> schema(
       LoadDictionary("choices_schema.json"));
 
-  ExpectValid(TEST_SOURCE,
-              scoped_ptr<base::Value>(base::Value::CreateNullValue()).get(),
-              schema.get(), NULL);
+  ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
+              NULL);
   ExpectValid(TEST_SOURCE,
               scoped_ptr<base::Value>(new base::FundamentalValue(42)).get(),
               schema.get(), NULL);
 
   scoped_ptr<base::DictionaryValue> instance(new base::DictionaryValue());
   instance->SetString("foo", "bar");
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
 
   ExpectNotValid(TEST_SOURCE,
                  scoped_ptr<base::Value>(new base::StringValue("foo")).get(),
@@ skipping 431 matching lines @@
             JSONSchemaValidator::GetJSONSchemaType(
                 scoped_ptr<base::Value>(new base::StringValue("foo")).get()));
   EXPECT_EQ(std::string(schema::kArray),
             JSONSchemaValidator::GetJSONSchemaType(
                 scoped_ptr<base::Value>(new base::ListValue()).get()));
   EXPECT_EQ(std::string(schema::kObject),
             JSONSchemaValidator::GetJSONSchemaType(
                 scoped_ptr<base::Value>(new base::DictionaryValue()).get()));
   EXPECT_EQ(std::string(schema::kNull),
             JSONSchemaValidator::GetJSONSchemaType(
-                scoped_ptr<base::Value>(base::Value::CreateNullValue()).get()));
+                base::Value::CreateNullValue().get()));
 }
 
 void JSONSchemaValidatorTestBase::TestTypes() {
   scoped_ptr<base::DictionaryValue> schema(new base::DictionaryValue());
 
   // valid
   schema->SetString(schema::kType, schema::kObject);
   ExpectValid(TEST_SOURCE,
               scoped_ptr<base::Value>(new base::DictionaryValue()).get(),
               schema.get(), NULL);
@@ skipping 42 matching lines @@
 
   schema->SetString(schema::kType, schema::kBoolean);
   ExpectValid(TEST_SOURCE,
               scoped_ptr<base::Value>(new base::FundamentalValue(false)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               scoped_ptr<base::Value>(new base::FundamentalValue(true)).get(),
               schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kNull);
-  ExpectValid(TEST_SOURCE,
-              scoped_ptr<base::Value>(base::Value::CreateNullValue()).get(),
-              schema.get(), NULL);
+  ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
+              NULL);
 
   // not valid
   schema->SetString(schema::kType, schema::kObject);
   ExpectNotValid(
       TEST_SOURCE,
       scoped_ptr<base::Value>(new base::ListValue()).get(),
       schema.get(),
       NULL,
       std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kObject, schema::kArray));
 
   schema->SetString(schema::kType, schema::kObject);
   ExpectNotValid(
-      TEST_SOURCE,
-      scoped_ptr<base::Value>(base::Value::CreateNullValue()).get(),
-      schema.get(),
-      NULL,
+      TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(), NULL,
       std::string(),
-      JSONSchemaValidator::FormatErrorMessage(
-          JSONSchemaValidator::kInvalidType, schema::kObject, schema::kNull));
+      JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
+                                              schema::kObject, schema::kNull));
 
   schema->SetString(schema::kType, schema::kArray);
   ExpectNotValid(
       TEST_SOURCE,
       scoped_ptr<base::Value>(new base::FundamentalValue(42)).get(),
       schema.get(),
       NULL,
       std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kArray, schema::kInteger));
@@ skipping 42 matching lines @@
   schema->SetString(schema::kType, schema::kNull);
   ExpectNotValid(
       TEST_SOURCE,
       scoped_ptr<base::Value>(new base::FundamentalValue(false)).get(),
       schema.get(),
       NULL,
       std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kNull, schema::kBoolean));
 }