Add favicon and publisher name to snippet cards

chrome/browser/android/ntp/ntp_snippets_bridge.cc

 // Copyright 2016 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/ntp/ntp_snippets_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 94 matching lines @@
       base::Bind(&SnippetVisitedHistoryRequestCallback, callback),
       &tracker_);
 }
 
 void NTPSnippetsBridge::NTPSnippetsServiceLoaded() {
   if (observer_.is_null())
     return;
 
   std::vector<std::string> titles;
   std::vector<std::string> urls;
+  std::vector<std::string> amp_urls;
   std::vector<std::string> thumbnail_urls;
   std::vector<std::string> snippets;
   std::vector<int64_t> timestamps;
+  std::vector<std::string> publishers;
   for (const ntp_snippets::NTPSnippet& snippet : *ntp_snippets_service_) {
+    // The url from source_info is a url for a site that is one of the
+    // HOST_RESTRICT parameters, so this is preferred. If there's an AMP url,
+    // prefer that over the plain url
+    urls.push_back(snippet.best_source().url.spec());
+    amp_urls.push_back(snippet.best_source().amp_url.is_empty()
+                           ? snippet.best_source().url.spec()

[Marc Treib, 2016/04/28 08:50:13]

Wait, if we don't have an AMP URL, then shouldn't the amp_urls entry stay empty?

[May, 2016/04/28 18:01:52]

Ah, yeah it should. Good catch.

+                           : snippet.best_source().amp_url.spec());
     titles.push_back(snippet.title());
-    urls.push_back(snippet.url().spec());
     thumbnail_urls.push_back(snippet.salient_image_url().spec());
     snippets.push_back(snippet.snippet());
     timestamps.push_back(snippet.publish_date().ToJavaTime());
+    publishers.push_back(snippet.best_source().publisher_name);
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_SnippetsBridge_onSnippetsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj(),
+      ToJavaArrayOfStrings(env, amp_urls).obj(),
       ToJavaArrayOfStrings(env, thumbnail_urls).obj(),
       ToJavaArrayOfStrings(env, snippets).obj(),
-      ToJavaLongArray(env, timestamps).obj());
+      ToJavaLongArray(env, timestamps).obj(),
+      ToJavaArrayOfStrings(env, publishers).obj());
 }
 
 void NTPSnippetsBridge::NTPSnippetsServiceShutdown() {
   observer_.Reset();
   snippet_service_observer_.Remove(ntp_snippets_service_);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }