[AiS] Fix parsing for Answers Images.

components/omnibox/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/search_suggestion_parser.h"
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/url_prefix.h"
 #include "components/url_fixer/url_fixer.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
+#include "url/url_constants.h"
 
 namespace {
 
 AutocompleteMatchType::Type GetAutocompleteMatchType(const std::string& type) {
   if (type == "ENTITY")
     return AutocompleteMatchType::SEARCH_SUGGEST_ENTITY;
   if (type == "INFINITE")
     return AutocompleteMatchType::SEARCH_SUGGEST_INFINITE;
   if (type == "PERSONALIZED_QUERY")
     return AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED;
@@ skipping 446 matching lines @@
   }
   results->relevances_from_server = relevances != NULL;
   return true;
 }
 
 // static
 void SearchSuggestionParser::GetAnswersImageURLs(
     const base::DictionaryValue* answer_json,
     std::vector<GURL>* urls) {
   DCHECK(answer_json);
+
   const base::ListValue* lines = NULL;
-  answer_json->GetList("l", &lines);
-  if (!lines || lines->GetSize() == 0)
+  if (!answer_json->GetList("l", &lines) || !lines || lines->GetSize() == 0)
     return;
 
-  for (size_t line = 0; line < lines->GetSize(); ++line) {
-    const base::DictionaryValue* imageLine = NULL;
-    lines->GetDictionary(line, &imageLine);
-    if (!imageLine)
+  for (base::ListValue::const_iterator iter = lines->begin();
+       iter != lines->end(); ++iter) {
+    const base::DictionaryValue* line = NULL;
+    if (!(*iter)->GetAsDictionary(&line) || !line)
       continue;
-    const base::DictionaryValue* imageData = NULL;
-    imageLine->GetDictionary("i", &imageData);
-    if (!imageData)
+
+    std::string imageUrl;

[Mark P, 2014/08/22 16:21:08]

I thought you said you'd use host_and_path?

Regardless, camelcase is wrong.

[groby-ooo-7-16, 2014/08/22 18:23:11]

Done. Now for real.

+    if (!line->GetString("il.i.d", &imageUrl) || imageUrl.empty())
       continue;
-    std::string imageUrl;
-    imageData->GetString("d", &imageUrl);
-    urls->push_back(GURL(imageUrl));
+    urls->push_back(GURL(std::string(url::kHttpsScheme) + ":" + imageUrl));

[Mark P, 2014/08/22 16:21:08]

Only ":", not "://" (the url::kStandardSchemeSeparator)?
Either please fix or explain (in comments) why you can't use the standard scheme
separator?

[groby-ooo-7-16, 2014/08/22 18:23:11]

Done.

   }
 }