Change the signature of JSONReader::Read() and related methods to be more

chrome/common/json_value_serializer_perftest.cc

 // Copyright (c) 2006-2008 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 <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
@@ skipping 34 matching lines @@
 // Test deserialization of a json string into a Value object.  We run the test
 // using 3 sample strings for both the current decoder and jsoncpp's decoder.
 TEST_F(JSONValueSerializerTests, Reading) {
   printf("\n");
   const int kIterations = 100000;
 
   // Test chrome json implementation
   PerfTimeLogger chrome_timer("chrome");
   for (int i = 0; i < kIterations; ++i) {
     for (size_t j = 0; j < test_cases_.size(); ++j) {
-      Value* root = NULL;
       JSONStringValueSerializer reader(test_cases_[j]);
-      ASSERT_TRUE(reader.Deserialize(&root, NULL));
-      delete root;
+      scoped_ptr<Value> root(reader.Deserialize(NULL));
+      ASSERT_TRUE(root.get());
     }
   }
   chrome_timer.Done();
 }
 
 TEST_F(JSONValueSerializerTests, CompactWriting) {
   printf("\n");
   const int kIterations = 100000;
   // Convert test cases to Value objects.
   std::vector<Value*> test_cases;
   for (size_t i = 0; i < test_cases_.size(); ++i) {
-    Value* root = NULL;
     JSONStringValueSerializer reader(test_cases_[i]);
-    ASSERT_TRUE(reader.Deserialize(&root, NULL));
+    Value* root = reader.Deserialize(NULL);
+    ASSERT_TRUE(root);
     test_cases.push_back(root);
   }
 
   PerfTimeLogger chrome_timer("chrome");
   for (int i = 0; i < kIterations; ++i) {
     for (size_t j = 0; j < test_cases.size(); ++j) {
       std::string json;
       JSONStringValueSerializer reader(&json);
       ASSERT_TRUE(reader.Serialize(*test_cases[j]));
     }
   }
   chrome_timer.Done();
 
   // Clean up test cases.
   for (size_t i = 0; i < test_cases.size(); ++i) {
     delete test_cases[i];
     test_cases[i] = NULL;
   }
 }