[Icons NTP] Refactor large_icon_source to extract the logic shared between desktop and Android to f…

chrome/browser/ui/webui/large_icon_source.h

Index: chrome/browser/ui/webui/large_icon_source.h
diff --git a/chrome/browser/ui/webui/large_icon_source.h b/chrome/browser/ui/webui/large_icon_source.h
index 05872d2a1917eb70316a1d4661c5f065cad2d0b7..aaa160a173dacba18535e1823ef3a984f30c4209 100644
--- a/chrome/browser/ui/webui/large_icon_source.h
+++ b/chrome/browser/ui/webui/large_icon_source.h
@@ -6,14 +6,12 @@
 #define CHROME_BROWSER_UI_WEBUI_LARGE_ICON_SOURCE_H_
 
 #include <string>
-#include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/favicon/core/fallback_icon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/url_data_source.h"
-#include "third_party/skia/include/core/SkColor.h"
 
 namespace favicon {
 class FallbackIconService;
@@ -53,34 +51,13 @@ class LargeIconSource : public content::URLDataSource {
   bool ShouldReplaceExistingSource() const override;
   bool ShouldServiceRequest(const net::URLRequest* request) const override;
 
- protected:
-  struct IconRequest {
-    IconRequest();
-    IconRequest(const content::URLDataSource::GotDataCallback& callback_in,
-                const GURL& path_in,
-                int size_in);
-    ~IconRequest();
-
-    content::URLDataSource::GotDataCallback callback;
-    GURL url;
-    int size;
-  };
-
  private:
   // Callback for icon data retrieval request.
   void OnIconDataAvailable(
-      const IconRequest& request,
-      const favicon_base::FaviconRawBitmapResult& bitmap_result);
-
-  // Renders and sends a default fallback icon. This is used when there is no
-  // known text and/or foreground color to use for the generated icon (it
-  // defaults to a light text color on a dark gray background).
-  void SendDefaultFallbackIcon(const IconRequest& request);
-
-  // Renders and sends a fallback icon using the given colors.
-  void SendFallbackIcon(const IconRequest& request,
-                        SkColor text_color,
-                        SkColor background_color);
+      const content::URLDataSource::GotDataCallback& callback,
+      const GURL& url,
+      int size,
+      const favicon_base::LargeIconResult& bitmap_result);
 
   // Returns null to trigger "Not Found" response.
   void SendNotFoundResponse(
@@ -92,12 +69,6 @@ class LargeIconSource : public content::URLDataSource {
 
   favicon::FallbackIconService* fallback_icon_service_;
 
-  // A pre-populated list of the types of icon files to consider when looking
-  // for the largest matching icon.
-  // Note: this is simply an optimization over populating an icon type vector
-  //     on each request.
-  std::vector<int> large_icon_types_;
-
   DISALLOW_COPY_AND_ASSIGN(LargeIconSource);
 };