Make ValueDeserializer::Deserialize return scoped_ptr

chrome/test/media_router/media_router_integration_browsertest.cc

 // Copyright 2015 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/test/media_router/media_router_integration_browsertest.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
@@ skipping 140 matching lines @@
   CHECK(dialog_contents);
   return dialog_contents;
 }
 
 void MediaRouterIntegrationBrowserTest::SetTestData(
     base::FilePath::StringPieceType test_data_file) {
   base::FilePath full_path = GetResourceFile(test_data_file);
   JSONFileValueDeserializer deserializer(full_path);
   int error_code = 0;
   std::string error_message;
-  scoped_ptr<base::Value> value(
-      deserializer.Deserialize(&error_code, &error_message));
+  scoped_ptr<base::Value> value =
+      deserializer.Deserialize(&error_code, &error_message);
   CHECK(value.get()) << "Deserialize failed: " << error_message;
   std::string test_data_str;
   ASSERT_TRUE(base::JSONWriter::Write(*value, &test_data_str));
   ExecuteScriptInBackgroundPageNoWait(
       extension_id_,
       base::StringPrintf("localStorage['testdata'] = '%s'",
                          test_data_str.c_str()));
 }
 
 content::WebContents* MediaRouterIntegrationBrowserTest::OpenMRDialog(
@@ skipping 194 matching lines @@
   content::WebContents* new_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(new_web_contents);
   ExecuteJavaScriptAPI(
       new_web_contents,
       base::StringPrintf("checkReconnectSessionFails('%s');",
                          session_id.c_str()));
 }
 
 }  // namespace media_router