Make ValueDeserializer::Deserialize return scoped_ptr

components/omnibox/browser/search_suggestion_parser.cc

 // Copyright 2014 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/omnibox/browser/search_suggestion_parser.h"
 
 #include <algorithm>
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 358 matching lines @@
   // The JSON response should be an array.
   for (size_t response_start_index = json_data.find("["), i = 0;
        response_start_index != base::StringPiece::npos && i < 5;
        response_start_index = json_data.find("[", 1), i++) {
     // Remove any XSSI guards to allow for JSON parsing.
     json_data.remove_prefix(response_start_index);
 
     JSONStringValueDeserializer deserializer(json_data);
     deserializer.set_allow_trailing_comma(true);
     int error_code = 0;
-    scoped_ptr<base::Value> data(deserializer.Deserialize(&error_code, NULL));
+    scoped_ptr<base::Value> data = deserializer.Deserialize(&error_code, NULL);
     if (error_code == 0)
       return data.Pass();
   }
   return scoped_ptr<base::Value>();
 }
 
 // static
 bool SearchSuggestionParser::ParseSuggestResults(
     const base::Value& root_val,
     const AutocompleteInput& input,
@@ skipping 158 matching lines @@
           base::CollapseWhitespace(suggestion, false), match_type,
           base::CollapseWhitespace(match_contents, false),
           match_contents_prefix, annotation, answer_contents, answer_type_str,
           answer.Pass(), suggest_query_params, deletion_url, is_keyword_result,
           relevance, relevances != NULL, should_prefetch, trimmed_input));
     }
   }
   results->relevances_from_server = relevances != NULL;
   return true;
 }