Change JSONReader::ReadToValue to return a scoped_ptr

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/process/kill.h"
@@ skipping 132 matching lines @@
   if (!dom_op_observer.WaitAndGetResponse(&json)) {
     DLOG(ERROR) << "Cannot communicate with DOMOperationObserver.";
     return false;
   }
 
   // Nothing more to do for callers that ignore the returned JS value.
   if (!result)
     return true;
 
   base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS);
-  result->reset(reader.ReadToValue(json));
-  if (!result->get()) {
+  *result = reader.ReadToValue(json);
+  if (!*result) {
     DLOG(ERROR) << reader.GetErrorMessage();
     return false;
   }
 
   return true;
 }
 
 void BuildSimpleWebKeyEvent(blink::WebInputEvent::Type type,
                             ui::KeyboardCode key_code,
                             int native_key_code,
@@ skipping 788 matching lines @@
 
 bool WebContentsAddedObserver::RenderViewCreatedCalled() {
   if (child_observer_) {
     return child_observer_->render_view_created_called_ &&
            child_observer_->main_frame_created_called_;
   }
   return false;
 }
 
 }  // namespace content