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

base/json/json_parser.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 "base/json/json_parser.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 881 matching lines @@
 
   if (len == 0)
     return false;
 
   if (!allow_leading_zeros && len > 1 && first == '0')
     return false;
 
   return true;
 }
 
 Value* JSONParser::ConsumeLiteral() {

[danakj, 2015/05/08 18:07:25]

TODO to make this return a scoped_ptr?

[Evan Stade, 2015/05/08 18:32:09]

I don't think that's all that helpful. If there were a TODO in every place that
ought to be using a scoped_ptr, it would probably add 10,000 lines to Chrome. In
general, it's not that difficult to find which places should have scoped_ptrs,
so I don't think a comment adds much anyway.

   switch (*pos_) {
     case 't': {
       const char kTrueLiteral[] = "true";
       const int kTrueLen = static_cast<int>(strlen(kTrueLiteral));
       if (!CanConsume(kTrueLen - 1) ||
           !StringsAreEqual(pos_, kTrueLiteral, kTrueLen)) {
         ReportError(JSONReader::JSON_SYNTAX_ERROR, 1);
         return NULL;
       }
       NextNChars(kTrueLen - 1);
@@ skipping 12 matching lines @@
     }
     case 'n': {
       const char kNullLiteral[] = "null";
       const int kNullLen = static_cast<int>(strlen(kNullLiteral));
       if (!CanConsume(kNullLen - 1) ||
           !StringsAreEqual(pos_, kNullLiteral, kNullLen)) {
         ReportError(JSONReader::JSON_SYNTAX_ERROR, 1);
         return NULL;
       }
       NextNChars(kNullLen - 1);
-      return Value::CreateNullValue();
+      return Value::CreateNullValue().release();
     }
     default:
       ReportError(JSONReader::JSON_UNEXPECTED_TOKEN, 1);
       return NULL;
   }
 }
 
 // static
 bool JSONParser::StringsAreEqual(const char* one, const char* two, size_t len) {
   return strncmp(one, two, len) == 0;
@@ skipping 11 matching lines @@
                                            const std::string& description) {
   if (line || column) {
     return StringPrintf("Line: %i, column: %i, %s",
         line, column, description.c_str());
   }
   return description;
 }
 
 }  // namespace internal
 }  // namespace base