Ntp: use AMP urls for content suggestions when available.

components/ntp_snippets/content_suggestion.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTION_H_
 #define COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTION_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 64 matching lines @@
                     const std::string& id_within_category,
                     const GURL& url);
   ContentSuggestion(ContentSuggestion&&);
   ContentSuggestion& operator=(ContentSuggestion&&);
 
   ~ContentSuggestion();
 
   // An ID for identifying the suggestion. The ID is unique application-wide.
   const ID& id() const { return id_; }
 
-  // The normal content URL where the content referenced by the suggestion can
-  // be accessed.
+  // The URL where the content referenced by the suggestion can be accessed.
+  // This may be an AMP URL.
   const GURL& url() const { return url_; }
 
-  // If available, this contains an URL to an AMP version of the same content.
-  // Otherwise, this is an empty GURL().
-  const GURL& amp_url() const { return amp_url_; }
-  void set_amp_url(const GURL& amp_url) { amp_url_ = amp_url; }
-
   // Title of the suggestion.
   const base::string16& title() const { return title_; }
   void set_title(const base::string16& title) { title_ = title; }
 
   // Summary or relevant textual extract from the content.
   const base::string16& snippet_text() const { return snippet_text_; }
   void set_snippet_text(const base::string16& snippet_text) {
     snippet_text_ = snippet_text;
   }
 
@@ skipping 30 matching lines @@
   // KnownCategories::RECENT_TABS suggestions.
   RecentTabSuggestionExtra* recent_tab_suggestion_extra() const {
     return recent_tab_suggestion_extra_.get();
   }
   void set_recent_tab_suggestion_extra(
       std::unique_ptr<RecentTabSuggestionExtra> recent_tab_suggestion_extra);
 
  private:
   ID id_;
   GURL url_;
-  GURL amp_url_;
   base::string16 title_;
   base::string16 snippet_text_;
   base::Time publish_date_;
   base::string16 publisher_name_;
   float score_;
   std::unique_ptr<DownloadSuggestionExtra> download_suggestion_extra_;
   std::unique_ptr<RecentTabSuggestionExtra> recent_tab_suggestion_extra_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSuggestion);
 };
 
 std::ostream& operator<<(std::ostream& os, const ContentSuggestion::ID& id);
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTION_H_