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

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java
index 65b85dffe00d670f10b061be854f417c0de12012..a5f7c3cad02e345af784bdfbb591ab9a7338c354 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java
@@ -144,7 +144,7 @@ class ContextualSearchFakeServer
         private final int mStartAdjust;
         private final int mEndAdjust;
         private final String mContextLanguage;
-
+        private final String mThumbnailUrl;
 
         boolean mDidStartResolution;
         boolean mDidFinishResolution;
@@ -161,10 +161,12 @@ class ContextualSearchFakeServer
          * @param startAdjust           The start adjustment of the selection.
          * @param endAdjust             The end adjustment of the selection.
          * @param contextLanguage       The language of the context determined by the server.
+         * @param thumbnailUrl          The URL of a thumbnail to display.
          */
         FakeTapSearch(String nodeId, boolean isNetworkUnavailable, int responseCode,
                 String searchTerm, String displayText, String alternateTerm, String mid,
-                boolean doPreventPreload, int startAdjust, int endAdjust, String contextLanguage) {
+                boolean doPreventPreload, int startAdjust, int endAdjust, String contextLanguage,
+                String thumbnailUrl) {
             super(nodeId);
 
             mIsNetworkUnavailable = isNetworkUnavailable;
@@ -177,6 +179,7 @@ class ContextualSearchFakeServer
             mStartAdjust = startAdjust;
             mEndAdjust = endAdjust;
             mContextLanguage = contextLanguage;
+            mThumbnailUrl = thumbnailUrl;
         }
 
         @Override
@@ -248,7 +251,7 @@ class ContextualSearchFakeServer
                     if (!mDidFinishResolution) {
                         handleSearchTermResolutionResponse(mIsNetworkUnavailable, mResponseCode,
                                 mSearchTerm, mDisplayText, mAlternateTerm, mMid, mDoPreventPreload,
-                                mStartAdjust, mEndAdjust, mContextLanguage);
+                                mStartAdjust, mEndAdjust, mContextLanguage, mThumbnailUrl);
 
                         mActiveFakeTapSearch = null;
                         mDidFinishResolution = true;
@@ -278,12 +281,15 @@ class ContextualSearchFakeServer
          * @param startAdjust
          * @param endAdjust
          * @param contextLanguage
+         * @param thumbnailUrl
          */
         FakeSlowResolveSearch(String nodeId, boolean isNetworkUnavailable, int responseCode,
                 String searchTerm, String displayText, String alternateTerm, String mid,
-                boolean doPreventPreload, int startAdjust, int endAdjust, String contextLanguage) {
+                boolean doPreventPreload, int startAdjust, int endAdjust, String contextLanguage,
+                String thumbnailUrl) {
             super(nodeId, isNetworkUnavailable, responseCode, searchTerm, displayText,
-                    alternateTerm, mid, doPreventPreload, startAdjust, endAdjust, contextLanguage);
+                    alternateTerm, mid, doPreventPreload, startAdjust, endAdjust, contextLanguage,
+                    thumbnailUrl);
         }
 
         @Override
@@ -505,10 +511,10 @@ class ContextualSearchFakeServer
     public void handleSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode,
             String searchTerm, String displayText, String alternateTerm, String mid,
             boolean doPreventPreload, int selectionStartAdjust, int selectionEndAdjust,
-            String contextLanguage) {
+            String contextLanguage, String thumbnailUrl) {
         mBaseManager.handleSearchTermResolutionResponse(isNetworkUnavailable, responseCode,
                 searchTerm, displayText, alternateTerm, mid, doPreventPreload, selectionStartAdjust,
-                selectionEndAdjust, contextLanguage);
+                selectionEndAdjust, contextLanguage, thumbnailUrl);
     }
 
     @Override
@@ -541,16 +547,19 @@ class ContextualSearchFakeServer
         registerFakeLongPressSearch(new FakeLongPressSearch("resolution", "Resolution"));
 
         registerFakeTapSearch(new FakeTapSearch(
-                "search", false, 200, "Search", "Search", "alternate-term", "", false, 0, 0, ""));
+                "search", false, 200, "Search", "Search", "alternate-term", "", false, 0, 0, "",
+                ""));
         registerFakeTapSearch(new FakeTapSearch(
-                "term", false, 200, "Term", "Term", "alternate-term", "", false, 0, 0, ""));
+                "term", false, 200, "Term", "Term", "alternate-term", "", false, 0, 0, "",
+                ""));
         registerFakeTapSearch(new FakeTapSearch("resolution", false, 200, "Resolution",
-                "Resolution", "alternate-term", "", false, 0, 0, ""));
+                "Resolution", "alternate-term", "", false, 0, 0, "", ""));
         registerFakeTapSearch(new FakeTapSearch("german", false, 200, "Deutsche", "Deutsche",
-                "alternate-term", "", false, 0, 0, "de"));
+                "alternate-term", "", false, 0, 0, "de", ""));
 
         registerFakeSlowResolveSearch(new FakeSlowResolveSearch(
-                "search", false, 200, "Search", "Search", "alternate-term", "", false, 0, 0, ""));
+                "search", false, 200, "Search", "Search", "alternate-term", "", false, 0, 0, "",
+                ""));
     }
 
     /**