Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/ui/app_list/start_page_service.cc

 // Copyright 2013 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/browser/ui/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 649 matching lines @@
 
   // Remove XSSI guard for JSON parsing.
   size_t json_start_index = json_data.find("{");
   base::StringPiece json_data_substr(json_data);
   if (json_start_index != std::string::npos)
     json_data_substr.remove_prefix(json_start_index);
 
   JSONStringValueDeserializer deserializer(json_data_substr);
   deserializer.set_allow_trailing_comma(true);
   int error_code = 0;
-  scoped_ptr<base::Value> doodle_json(
-      deserializer.Deserialize(&error_code, nullptr));
+  scoped_ptr<base::Value> doodle_json =
+      deserializer.Deserialize(&error_code, nullptr);
 
   base::TimeDelta recheck_delay;
   if (error_code != 0) {
     // On failure, use expotential backoff.
     backoff_entry_.InformOfRequest(false);
     recheck_delay = backoff_entry_.GetTimeUntilRelease();
   } else {
     // If we received information, even if there's no doodle, reset the backoff
     // entry and start rechecking for the doodle at the maximum interval.
     backoff_entry_.Reset();
     recheck_delay = base::TimeDelta::FromMilliseconds(kMaximumRecheckDelayMs);
 
     if (contents_ && contents_->GetWebUI()) {
       contents_->GetWebUI()->CallJavascriptFunction(
           "appList.startPage.onAppListDoodleUpdated", *doodle_json,
           base::StringValue(
               UIThreadSearchTermsData(profile_).GoogleBaseURLValue()));
     }
   }
 
   // Check for a new doodle.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartPageService::FetchDoodleJson,
                  weak_factory_.GetWeakPtr()),
       recheck_delay);
 }
 
 }  // namespace app_list