[Content suggestions] Reveal URL with favicon in snippets-internals

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 94 matching lines @@
 
   ~ContentSuggestion();
 
   // An ID for identifying the suggestion. The ID is unique application-wide.
   const ID& id() const { return id_; }
 
   // The URL where the content referenced by the suggestion can be accessed.
   // This may be an AMP URL.
   const GURL& url() const { return url_; }
 
-  // The URL of a page that links to a favicon that represents the suggestion.
-  const GURL& url_with_favicon() const {
-    return url_with_favicon_.is_valid() ? url_with_favicon_ : url_;
+  // The URL of the page that links to a favicon that represents the suggestion.
+  // Path is trimmed for the URL because the current favicon server backend
+  // prefers it this way.
+  GURL url_with_favicon() const {
+    return url_with_favicon_.is_valid() ? url_with_favicon_.GetWithEmptyPath()
+                                        : url_.GetWithEmptyPath();
   }
   void set_url_with_favicon(const GURL& url_with_favicon) {
     url_with_favicon_ = url_with_favicon;
   }
 
   // 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.
@@ skipping 83 matching lines @@
   base::Time fetch_date_;
 
   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_