[NTP] Propagate OfflineId from C++ for Downloads.

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 <utility>
 #include <vector>
 
@@ skipping 63 matching lines @@
         ConvertUTF8ToJavaString(env, suggestion.id().id_within_category()),
         ConvertUTF16ToJavaString(env, suggestion.title()),
         ConvertUTF16ToJavaString(env, suggestion.publisher_name()),
         ConvertUTF16ToJavaString(env, suggestion.snippet_text()),
         ConvertUTF8ToJavaString(env, suggestion.url().spec()),
         ConvertUTF8ToJavaString(env, suggestion.amp_url().spec()),
         suggestion.publish_date().ToJavaTime(), suggestion.score(),
         static_cast<int>(info->card_layout()));
     if (suggestion.id().category().IsKnownCategory(
             KnownCategories::DOWNLOADS) &&
-        suggestion.download_suggestion_extra() != nullptr &&
-        suggestion.download_suggestion_extra()->is_download_asset) {
-      Java_SnippetsBridge_setDownloadAssetDataForLastSuggestion(
-          env, result,
-          ConvertUTF8ToJavaString(
-              env,
-              suggestion.download_suggestion_extra()->target_file_path.value()),
-          ConvertUTF8ToJavaString(
-              env, suggestion.download_suggestion_extra()->mime_type));
+        suggestion.download_suggestion_extra() != nullptr) {
+      if (suggestion.download_suggestion_extra()->is_download_asset) {
+        Java_SnippetsBridge_setDownloadAssetDataForLastSuggestion(
+            env, result,
+            ConvertUTF8ToJavaString(env, suggestion.download_suggestion_extra()
+                                             ->target_file_path.value()),
+            ConvertUTF8ToJavaString(
+                env, suggestion.download_suggestion_extra()->mime_type));
+      } else {
+        Java_SnippetsBridge_setDownloadOfflinePageDataForLastSuggestion(
+            env, result,
+            suggestion.download_suggestion_extra()->offline_page_id);
+      }
     }
     if (suggestion.id().category().IsKnownCategory(
             KnownCategories::RECENT_TABS) &&
         suggestion.recent_tab_suggestion_extra() != nullptr) {
       Java_SnippetsBridge_setRecentTabDataForLastSuggestion(
           env, result,
           ConvertUTF8ToJavaString(
               env, suggestion.recent_tab_suggestion_extra()->tab_id),
-          ConvertUTF8ToJavaString(
-              env, suggestion.recent_tab_suggestion_extra()->offline_page_id));
+          suggestion.recent_tab_suggestion_extra()->offline_page_id);
     }
   }
 
   return result;
 }
 
 }  // namespace
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
@@ skipping 343 matching lines @@
 }
 
 Category NTPSnippetsBridge::CategoryFromIDValue(jint id) {
   return content_suggestions_service_->category_factory()->FromIDValue(id);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }