Ensure zero suggest can handle XSSI-escaped output.

chrome/browser/autocomplete/search_provider.cc

 // Copyright 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 "chrome/browser/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 635 matching lines @@
       if (response_headers->GetCharset(&charset)) {
         string16 data_16;
         // TODO(jungshik): Switch to CodePageToUTF8 after it's added.
         if (base::CodepageToUTF16(json_data, charset.c_str(),
                                   base::OnStringConversionError::FAIL,
                                   &data_16))
           json_data = UTF16ToUTF8(data_16);
       }
     }
 
-    // The JSON response should be an array.
-    for (size_t response_start_index = json_data.find("["), i = 0;
-         response_start_index != std::string::npos && i < 5;
-         response_start_index = json_data.find("[", 1), i++) {
-      // Remove any XSSI guards to allow for JSON parsing.
-      if (response_start_index > 0)
-        json_data.erase(0, response_start_index);
-
-      JSONStringValueSerializer deserializer(json_data);
-      deserializer.set_allow_trailing_comma(true);
-      int error_code = 0;
-      scoped_ptr<Value> data(deserializer.Deserialize(&error_code, NULL));
-      if (error_code == 0) {
-        results_updated = data.get() &&
-            ParseSuggestResults(data.get(), is_keyword);
-        break;
-      }
-    }
+    scoped_ptr<Value> data(DeserializeJsonData(json_data));
+    results_updated = data.get() && ParseSuggestResults(data.get(), is_keyword);
   }
 
   UpdateMatches();
   if (done_ || results_updated)
     listener_->OnProviderUpdate(results_updated);
 }
 
 void SearchProvider::Run() {
   // Start a new request with the current input.
   suggest_results_pending_ = 0;
@@ skipping 349 matching lines @@
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   // Add Chrome experiment state to the request headers.
   net::HttpRequestHeaders headers;
   chrome_variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
       fetcher->GetOriginalURL(), profile_->IsOffTheRecord(), false, &headers);
   fetcher->SetExtraRequestHeaders(headers.ToString());
   fetcher->Start();
   return fetcher;
 }
 
+scoped_ptr<Value> SearchProvider::DeserializeJsonData(std::string json_data) {
+  // The JSON response should be an array.
+  for (size_t response_start_index = json_data.find("["), i = 0;
+       response_start_index != std::string::npos && i < 5;
+       response_start_index = json_data.find("[", 1), i++) {
+    // Remove any XSSI guards to allow for JSON parsing.
+    if (response_start_index > 0)
+      json_data.erase(0, response_start_index);
+
+    JSONStringValueSerializer deserializer(json_data);
+    deserializer.set_allow_trailing_comma(true);
+    int error_code = 0;
+    scoped_ptr<Value> data(deserializer.Deserialize(&error_code, NULL));
+    if (error_code == 0) {

[H Fung, 2013/12/02 23:43:45]

No curly braces since I think that's the convention here?

[Maria, 2013/12/03 00:48:02]

Done.

+      return data.Pass();
+    }
+  }
+  return scoped_ptr<Value>();
+}
+
 bool SearchProvider::ParseSuggestResults(Value* root_val, bool is_keyword) {
   string16 query;
   ListValue* root_list = NULL;
   ListValue* results_list = NULL;
   const string16& input_text =
       is_keyword ? keyword_input_.text() : input_.text();
   if (!root_val->GetAsList(&root_list) || !root_list->GetString(0, &query) ||
       (query != input_text) || !root_list->GetList(1, &results_list))
     return false;
 
@@ skipping 892 matching lines @@
     it->set_relevance(max_query_relevance);
     it->set_relevance_from_server(relevance_from_server);
   }
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when the timer isn't running, there are no suggest queries
   // pending, and we're not waiting on Instant.
   done_ = !timer_.IsRunning() && (suggest_results_pending_ == 0);
 }