[Contextual Search] Fetch and display thumbnails returned in resolution response

chrome/browser/android/contextualsearch/contextual_search_delegate.cc

 // Copyright 2015 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/android/contextualsearch/contextual_search_delegate.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 146 matching lines @@
   std::string search_term;
   std::string display_text;
   std::string alternate_term;
   std::string mid;
   std::string prevent_preload;
   int mention_start = 0;
   int mention_end = 0;
   int start_adjust = 0;
   int end_adjust = 0;
   std::string context_language;
+  std::string thumbnail_url = "";
 
   DecodeSearchTermFromJsonResponse(
       json_string, &search_term, &display_text, &alternate_term, &mid,
-      &prevent_preload, &mention_start, &mention_end, &context_language);
+      &prevent_preload, &mention_start, &mention_end, &context_language,
+      &thumbnail_url);
   if (mention_start != 0 || mention_end != 0) {
     // Sanity check that our selection is non-zero and it is less than
     // 100 characters as that would make contextual search bar hide.
     // We also check that there is at least one character overlap between
     // the new and old selection.
     if (mention_start >= mention_end ||
         (mention_end - mention_start) > kContextualSearchMaxSelection ||
         mention_end <= context_->start_offset ||
         mention_start >= context_->end_offset) {
       start_adjust = 0;
       end_adjust = 0;
     } else {
       start_adjust = mention_start - context_->start_offset;
       end_adjust = mention_end - context_->end_offset;
     }
   }
   bool is_invalid = response_code == net::URLFetcher::RESPONSE_CODE_INVALID;
   return std::unique_ptr<ResolvedSearchTerm>(new ResolvedSearchTerm(
       is_invalid, response_code, search_term, display_text, alternate_term, mid,
       prevent_preload == kDoPreventPreloadValue, start_adjust, end_adjust,
-      context_language));
+      context_language, thumbnail_url));
 }
 
 std::string ContextualSearchDelegate::BuildRequestUrl(std::string selection) {
   // TODO(donnd): Confirm this is the right way to handle TemplateURL fails.
   if (!template_url_service_ ||
       !template_url_service_->GetDefaultSearchProvider()) {
     return std::string();
   }
 
   std::string selected_text(net::EscapeQueryParamValue(selection, true));
@@ skipping 227 matching lines @@
 // the value of the given parameters.
 void ContextualSearchDelegate::DecodeSearchTermFromJsonResponse(
     const std::string& response,
     std::string* search_term,
     std::string* display_text,
     std::string* alternate_term,
     std::string* mid,
     std::string* prevent_preload,
     int* mention_start,
     int* mention_end,
-    std::string* lang) {
+    std::string* lang,
+    std::string* thumbnail_url) {
   bool contains_xssi_escape =
       base::StartsWith(response, kXssiEscape, base::CompareCase::SENSITIVE);
   const std::string& proper_json =
       contains_xssi_escape ? response.substr(sizeof(kXssiEscape) - 1)
                            : response;
   JSONStringValueDeserializer deserializer(proper_json);
   std::unique_ptr<base::Value> root =
       deserializer.Deserialize(nullptr, nullptr);
   std::unique_ptr<base::DictionaryValue> dict =
       base::DictionaryValue::From(std::move(root));
@@ skipping 25 matching lines @@
   dict->GetString(kContextualSearchResponseSelectedTextParam, &selected_text);
   if (selected_text != *search_term) {
     *alternate_term = selected_text;
   } else {
     std::string resolved_term;
     dict->GetString(kContextualSearchResponseResolvedTermParam, &resolved_term);
     if (resolved_term != *search_term) {
       *alternate_term = resolved_term;
     }
   }
+
+  // TODO(donnd): extract thumbnail_url. Also extract caption and pipe through.
 }
 
 // Extract the Start/End of the mentions in the surrounding text
 // for selection-expansion.
 void ContextualSearchDelegate::ExtractMentionsStartEnd(
     const base::ListValue& mentions_list,
     int* startResult,
     int* endResult) {
   int int_value;
   if (mentions_list.GetInteger(0, &int_value))
@@ skipping 22 matching lines @@
     end_offset -= trim;
   }
   if (result_text.length() > end_offset + padding_each_side_pinned) {
     // Trim the end.
     result_text = result_text.substr(0, end_offset + padding_each_side_pinned);
   }
   *start = start_offset;
   *end = end_offset;
   return result_text;
 }