[TTS] Update Contextual Cards response decoding for v1.

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 27 matching lines @@
 namespace {
 
 const char kContextualSearchResponseDisplayTextParam[] = "display_text";
 const char kContextualSearchResponseSelectedTextParam[] = "selected_text";
 const char kContextualSearchResponseSearchTermParam[] = "search_term";
 const char kContextualSearchResponseLanguageParam[] = "lang";
 const char kContextualSearchResponseMidParam[] = "mid";
 const char kContextualSearchResponseResolvedTermParam[] = "resolved_term";
 const char kContextualSearchPreventPreload[] = "prevent_preload";
 const char kContextualSearchMentions[] = "mentions";
+const char kContextualSearchCaption[] = "caption";
+const char kContextualSearchThumbnail[] = "thumbnail";
 const char kContextualSearchServerEndpoint[] = "_/contextualsearch?";
 const int kContextualSearchRequestVersion = 2;
 const int kContextualSearchMaxSelection = 100;
 const char kXssiEscape[] = ")]}'\n";
 const char kDiscourseContextHeaderPrefix[] = "X-Additional-Discourse-Context: ";
 const char kDoPreventPreloadValue[] = "1";
 
 // The number of characters that should be shown after the selected expression.
 const int kSurroundingSizeForUI = 60;
 
-// Contextual Cards (aka Now on Tap) integration.
-const char kContextualSearchContextualCards[] = "contextual_cards";
-const char kContextualSearchCards[] = "cards";
-const char kContextualSearchSingleCard[] = "singleCard";
-const char kContextualSearchSubTitle[] = "subtitle";
-const char kContextualSearchThumbnailUri[] = "thumbnail.uri";
 // The version of the Now on Tap API that we want to invoke.
 const int kNowOnTapVersion = 1;
 
 } // namespace
 
 // URLFetcher ID, only used for tests: we only have one kind of fetcher.
 const int ContextualSearchDelegate::kContextualSearchURLFetcherID = 1;
 
 // Handles tasks for the ContextualSearchManager in a separable, testable way.
 ContextualSearchDelegate::ContextualSearchDelegate(
@@ skipping 421 matching lines @@
     *alternate_term = selected_text;
   } else {
     std::string resolved_term;
     dict->GetString(kContextualSearchResponseResolvedTermParam, &resolved_term);
     if (resolved_term != *search_term) {
       *alternate_term = resolved_term;
     }
   }
 
   if (field_trial_->IsNowOnTapBarIntegrationEnabled()) {
-    DecodeContextualCardsResponse(*dict.get(), caption, thumbnail_url);
+    // Get the basic Bar data for Now on Tap integration directly from the root.

[Theresa, 2016/09/22 20:54:02]

nit: s/Now on Tap/Contextual Cards

I plan to go through and rename some things before branch.

+    dict->GetString(kContextualSearchCaption, caption);
+    dict->GetString(kContextualSearchThumbnail, thumbnail_url);
   }
 }
 
 // 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;
@@ skipping 23 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;
 }
-
-void ContextualSearchDelegate::DecodeContextualCardsResponse(
-    const base::DictionaryValue& dict,
-    std::string* subtitle,
-    std::string* thumbnail) {
-  const base::DictionaryValue* contextual_cards_dict = nullptr;
-  if (!dict.GetDictionary(kContextualSearchContextualCards,
-                          &contextual_cards_dict))
-    return;
-
-  const base::ListValue* card_list = nullptr;
-  if (!contextual_cards_dict->GetList(kContextualSearchCards, &card_list))
-    return;
-
-  // TODO(donnd): remove these DCHECKS.  They are not needed since we never
-  // dereference if the values are missing.
-  DCHECK(card_list);
-  for (const auto& card : *card_list) {
-    const base::DictionaryValue* card_dict = nullptr;
-    if (!card->GetAsDictionary(&card_dict))
-      continue;
-
-    DCHECK(card_dict);
-    const base::DictionaryValue* single_card = nullptr;
-    if (!card_dict->GetDictionary(kContextualSearchSingleCard, &single_card))
-      continue;
-
-    DCHECK(single_card);
-    single_card->GetString(kContextualSearchSubTitle, subtitle);
-    single_card->GetString(kContextualSearchThumbnailUri, thumbnail);
-    return;
-  }
-}