Ntp: use AMP urls for content suggestions when available.

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
index 6bcd4d41dde35693146262ae324eacb0f205da68..ccc5188b4cb1d3289848a5c08abff182ab67bcc0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
@@ -30,9 +30,6 @@ public class SnippetArticle {
     /** The URL of this article. */
     public final String mUrl;

[vitaliii, 2016/12/20 15:51:46]

I would add a comment "May be AMP.".

[Michael van Ouwerkerk, 2016/12/20 16:12:48]

Done.

 
-    /** the AMP url for this article (possible for this to be empty). */
-    public final String mAmpUrl;
-
     /** The time when this article was published. */
     public final long mPublishTimestampMilliseconds;
 
@@ -51,7 +48,7 @@ public class SnippetArticle {
     /** Stores whether impression of this article has been tracked already. */
     private boolean mImpressionTracked;
 
-    /** To be run when the offline status of the article or AMP article changes. */

[vitaliii, 2016/12/20 15:51:46]

This comment is confusing. 
I understand what you mean only because I know this class, otherwise I would be
confused by "AMP article", because there is no other mention of AMP in entire
file. 

[Michael van Ouwerkerk, 2016/12/20 16:12:48]

I don't understand, could you have misread the diff? I deleted the "or AMP
article" part, not added.

[vitaliii, 2016/12/20 16:35:11]

Indeed, I misread the diff. Sorry.

+    /** To be run when the offline status of the article changes. */
     private Runnable mOfflineStatusChangeRunnable;

[vitaliii, 2016/12/20 15:51:46]

Have you tested offline pages support of AMP URLs? E.g. can you offline such a
page and then open?

[Michael van Ouwerkerk, 2016/12/20 16:12:48]

Yes, that works as well as regular pages. Do you have reason to suspect it
wouldn't work?

[vitaliii, 2016/12/20 16:35:11]

I am not familiar with AMP, so just wanted to make sure.

 
     /** Whether the linked article represents an asset download. */
@@ -73,15 +70,13 @@ public class SnippetArticle {
      * Creates a SnippetArticleListItem object that will hold the data.
      */
     public SnippetArticle(int category, String idWithinCategory, String title, String publisher,
-            String previewText, String url, String ampUrl, long timestamp, float score,
-            int position) {
+            String previewText, String url, long timestamp, float score, int position) {
         mCategory = category;
         mIdWithinCategory = idWithinCategory;
         mTitle = title;
         mPublisher = publisher;
         mPreviewText = previewText;
         mUrl = url;
-        mAmpUrl = ampUrl;
         mPublishTimestampMilliseconds = timestamp;
         mScore = score;
         mPosition = position;