Generalize content::URLDataSource so that it can be used by the network service.

chrome/browser/ui/webui/fallback_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/fallback_icon_source.h"
 
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/search/instant_io_context.h"
@@ skipping 48 matching lines @@
   return false;
 }
 
 bool FallbackIconSource::ShouldReplaceExistingSource() const {
   // Leave the existing DataSource in place, otherwise we'll drop any pending
   // requests on the floor.
   return false;
 }
 
 bool FallbackIconSource::ShouldServiceRequest(
-    const net::URLRequest* request) const {
-  if (request->url().SchemeIs(chrome::kChromeSearchScheme))
-    return InstantIOContext::ShouldServiceRequest(request);
-  return URLDataSource::ShouldServiceRequest(request);
+    const GURL& url,
+    content::ResourceContext* resource_context,
+    int render_process_id) const {
+  if (url.SchemeIs(chrome::kChromeSearchScheme)) {
+    return InstantIOContext::ShouldServiceRequest(url, resource_context,
+                                                  render_process_id);
+  }
+  return URLDataSource::ShouldServiceRequest(url, resource_context,
+                                             render_process_id);
 }
 
 void FallbackIconSource::SendFallbackIconHelper(
     const GURL& url,
     int size_in_pixels,
     const favicon_base::FallbackIconStyle& style,
     const content::URLDataSource::GotDataCallback& callback) {
   if (!fallback_icon_service_) {  // Can be null for tests.
     callback.Run(nullptr);  // Trigger "Not Found" response.
     return;
   }
   std::vector<unsigned char> bitmap_data =
       fallback_icon_service_->RenderFallbackIconBitmap(
           url, size_in_pixels, style);
   callback.Run(base::RefCountedBytes::TakeVector(&bitmap_data));
 }
 
 void FallbackIconSource::SendDefaultResponse(
     const content::URLDataSource::GotDataCallback& callback) {
   favicon_base::FallbackIconStyle default_style;
   SendFallbackIconHelper(GURL(), gfx::kFaviconSize, default_style, callback);
 }