[Icons NTP] Allow chrome-search:// large-icon and fallback-icon hosts to use <view_id>/<restricted_…

chrome/renderer/searchbox/searchbox.h

 // Copyright 2012 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 CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/ntp_logging_events.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "chrome/renderer/instant_restricted_id_cache.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
 namespace content {
 class RenderView;
 }
 
 class SearchBox : public content::RenderViewObserver,
                   public content::RenderViewObserverTracker<SearchBox> {
  public:
+  enum ImageSourceType {
+    NONE = -1,
+    FAVICON,
+    LARGE_ICON,
+    FALLBACK_ICON,
+    THUMB
+  };
+
+  // Helper class for GenerateImageURLFromTransientURL() to adapt SearchBox's
+  // instance, thereby allow mocking for unit tests.
+  class IconURLHelper {
+   public:
+    IconURLHelper();
+    virtual ~IconURLHelper();
+    virtual int GetViewID() const = 0;
+    virtual std::string GetURLStringFromRestrictedID(InstantRestrictedID rid)
+        const = 0;
+  };
+
   explicit SearchBox(content::RenderView* render_view);
   ~SearchBox() override;
 
   // Sends ChromeViewHostMsg_LogEvent to the browser.
   void LogEvent(NTPLoggingEventType event);
 
   // Sends ChromeViewHostMsg_LogMostVisitedImpression to the browser.
   void LogMostVisitedImpression(int position, const base::string16& provider);
 
   // Sends ChromeViewHostMsg_LogMostVisitedNavigation to the browser.
   void LogMostVisitedNavigation(int position, const base::string16& provider);
 
   // Sends ChromeViewHostMsg_ChromeIdentityCheck to the browser.
   void CheckIsUserSignedInToChromeAs(const base::string16& identity);
 
   // Sends ChromeViewHostMsg_HistorySyncCheck to the browser.
   void CheckIsUserSyncingHistory();
 
   // Sends ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem to the browser.
   void DeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
 
-  // Generates the favicon URL of the most visited item specified by the
-  // |transient_url|. If the |transient_url| is valid, returns true and fills in
-  // |url|. If the |transient_url| is invalid, returns true and |url| is set to
-  // "chrome-search://favicon/" in order to prevent the invalid URL to be
-  // requested.
+  // Generates the image URL of |type| for the most visited item specified in
+  // |transient_url|. If |transient_url| is valid, |url| with a translated URL
+  // and returns true.  Otherwise it depends on |type|:
+  // - FAVICON: Returns true and renders an URL to display the default favicon.
+  // - LARGE_ICON and FALLBACK_ICON: Returns false.
   //
-  // Valid forms of |transient_url|:
+  // For |type| == FAVICON, valid forms of |transient_url|:
   //    chrome-search://favicon/<view_id>/<restricted_id>
   //    chrome-search://favicon/<favicon_parameters>/<view_id>/<restricted_id>
-  bool GenerateFaviconURLFromTransientURL(const GURL& transient_url,
-                                          GURL* url) const;
-
-  // Generates the thumbnail URL of the most visited item specified by the
-  // |transient_url|. If the |transient_url| is valid, returns true and fills in
-  // |url|. If the |transient_url| is invalid, returns false  and |url| is not
-  // set.
   //
-  // Valid form of |transient_url|:
+  // For |type| == LARGE_ICON, valid form of |transient_url|:
+  //    chrome-search://large-icon/<size>/<view_id>/<restricted_id>
+  //
+  // For |type| == FALLBACK_ICON, valid form of |transient_url|:
+  //    chrome-search://fallback-icon/<icon styles>/<view_id>/<restricted_id>
+  //
+  // For |type| == THUMB, valid form of |transient_url|:
   //    chrome-search://thumb/<render_view_id>/<most_visited_item_id>
-  bool GenerateThumbnailURLFromTransientURL(const GURL& transient_url,
-                                            GURL* url) const;
+  //
+  // We do to prevent search providers from abusing image URLs and deduce

[James Hawkins, 2015/03/20 16:26:43]

nit: Please clean up the grammar at the beginning of this sentence, "We do to
prevent..."

[huangs, 2015/03/20 17:32:37]

Done.

+  // whether the user has visited a particular page. For example, if
+  // "chrome-search://favicon/http://www.secretsite.com" is accessible, then
+  // the search provider can use its return code to determine whether the user
+  // has visited "http://www.secretsite.com". Therefore we require search
+  // providers to specify URL by "<view_id>/<restricted_id>". We then translate
+  // this to the original |url|, and pass the request to the proper endpoint.
+  bool GenerateImageURLFromTransientURL(const GURL& transient_url,
+                                        ImageSourceType type,
+                                        GURL* url) const;
 
   // Returns the latest most visited items sent by the browser.
   void GetMostVisitedItems(
       std::vector<InstantMostVisitedItemIDPair>* items) const;
 
   // If the |most_visited_item_id| is found in the cache, sets |item| to it
   // and returns true.
   bool GetMostVisitedItemWithID(InstantRestrictedID most_visited_item_id,
                                 InstantMostVisitedItem* item) const;
 
@@ skipping 78 matching lines @@
   ThemeBackgroundInfo theme_info_;
   base::string16 query_;
   EmbeddedSearchRequestParams embedded_search_request_params_;
   int start_margin_;
   InstantSuggestion suggestion_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };
 
 #endif  // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_