Change the signature of JSONReader::Read() and related methods to be more

chrome/browser/autocomplete/search_provider.cc

 // Copyright (c) 2006-2008 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/autocomplete/search_provider.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_util.h"
@@ skipping 111 matching lines @@
     std::string charset;
     if (response_headers->GetCharset(&charset)) {
       std::wstring wide_data;
       // TODO(jungshik): Switch to CodePageToUTF8 after it's added.
       if (CodepageToWide(data, charset.c_str(),
                          OnStringUtilConversionError::FAIL, &wide_data))
         json_data = WideToUTF8(wide_data); 
     }
   }
 
-  JSONStringValueSerializer deserializer(json_data);
-  deserializer.set_allow_trailing_comma(true);
-  Value* root_val = NULL;
-  have_suggest_results_ = status.is_success() && (response_code == 200) &&
-      deserializer.Deserialize(&root_val, NULL) &&
-      ParseSuggestResults(root_val);
-  delete root_val;
+  if (status.is_success() && response_code == 200) {
+    JSONStringValueSerializer deserializer(json_data);
+    deserializer.set_allow_trailing_comma(true);
+    scoped_ptr<Value> root_val(deserializer.Deserialize(NULL));
+    have_suggest_results_ =
+        root_val.get() && ParseSuggestResults(root_val.get());
+  }
+
   ConvertResultsToAutocompleteMatches();
   listener_->OnProviderUpdate(!suggest_results_.empty());
 }
 
 void SearchProvider::StartOrStopHistoryQuery(bool minimal_changes) {
   // For the minimal_changes case, if we finished the previous query and still
   // have its results, or are allowed to keep running it, just do that, rather
   // than starting a new query.
   if (minimal_changes &&
       (have_history_results_ || (!done_ && !input_.synchronous_only())))
@@ skipping 455 matching lines @@
   const size_t after_slashes = std::min(url->length(),
                                         static_cast<size_t>(scheme.end() + 3));
   while ((prefix_len < after_slashes) && ((*url)[prefix_len] == L'/'))
     ++prefix_len;
   if (prefix_len == url->length())
     url->clear();
   else
     url->erase(url->begin(), url->begin() + prefix_len);
   return prefix_len;
 }