Remove non-Android handling in LargeIconSource

chrome/browser/ui/webui/large_icon_source.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/ui/webui/large_icon_source.h"
 
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon/core/fallback_icon_service.h"
 #include "components/favicon/core/large_icon_service.h"
 #include "components/favicon_base/fallback_icon_style.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/favicon_base/large_icon_url_parser.h"
 #include "net/url_request/url_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
 
 const int kMaxLargeIconSize = 192;  // Arbitrary bound to safeguard endpoint.
 
 }  // namespace
 
-LargeIconSource::LargeIconSource(
-    favicon::FallbackIconService* fallback_icon_service,
-    favicon::LargeIconService* large_icon_service)
-    : fallback_icon_service_(fallback_icon_service),
-      large_icon_service_(large_icon_service) {
-}
+LargeIconSource::LargeIconSource(favicon::LargeIconService* large_icon_service)
+    : large_icon_service_(large_icon_service) {}
 
 LargeIconSource::~LargeIconSource() {
 }
 
 std::string LargeIconSource::GetSource() const {
   return chrome::kChromeUILargeIconHost;
 }
 
 void LargeIconSource::StartDataRequest(
     const std::string& path,
@@ skipping 61 matching lines @@
 void LargeIconSource::OnLargeIconDataAvailable(
     const content::URLDataSource::GotDataCallback& callback,
     const GURL& url,
     int size,
     const favicon_base::LargeIconResult& result) {
   if (result.bitmap.is_valid()) {
     callback.Run(result.bitmap.bitmap_data.get());
     return;
   }
 
-  // Bitmap is invalid, use the fallback if service is available.
-  if (!fallback_icon_service_ || !result.fallback_icon_style) {
+  if (!result.fallback_icon_style) {
     SendNotFoundResponse(callback);
     return;
   }
 
-#if defined(OS_ANDROID)
   // RenderFallbackIconBitmap() cannot draw fallback icons on Android. See
   // crbug.com/580922 for details. Return a 1x1 bitmap so that JavaScript can
   // detect that it needs to generate a fallback icon.
   SkBitmap bitmap;
   bitmap.allocN32Pixels(1, 1);
   bitmap.eraseColor(result.fallback_icon_style->background_color);
   std::vector<unsigned char> bitmap_data;
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &bitmap_data))
     bitmap_data.clear();
-#else
-  std::vector<unsigned char> bitmap_data =
-      fallback_icon_service_->RenderFallbackIconBitmap(
-          url, size, *result.fallback_icon_style);
-#endif
 
   callback.Run(base::RefCountedBytes::TakeVector(&bitmap_data));
 }
 
 void LargeIconSource::SendNotFoundResponse(
     const content::URLDataSource::GotDataCallback& callback) {
   callback.Run(nullptr);
 }