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

chrome/browser/ui/webui/favicon_source.cc

Index: chrome/browser/ui/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index fca040d2370a60ea08cf6587f1f834b86eb0ac20..4b350a81bc81dbea3911c3af20f54174955b2a89 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -142,10 +142,15 @@ bool FaviconSource::ShouldReplaceExistingSource() const {
   return false;
 }
 
-bool FaviconSource::ShouldServiceRequest(const net::URLRequest* request) const {
-  if (request->url().SchemeIs(chrome::kChromeSearchScheme))
-    return InstantIOContext::ShouldServiceRequest(request);
-  return URLDataSource::ShouldServiceRequest(request);
+bool FaviconSource::ShouldServiceRequest(
+    const GURL& url,
+    content::ResourceContext* resource_context,
+    int render_process_id) const {
+  if (url.SchemeIs(chrome::kChromeSearchScheme))

[yzshen1, 2017/05/03 21:00:18]

Style nit: the if-body is multiple lines, therefore it needs to be enclosed by
{}.

(Here and other files.)

[jam, 2017/05/03 21:14:41]

Done.

+    return InstantIOContext::ShouldServiceRequest(url, resource_context,
+                                                  render_process_id);
+  return URLDataSource::ShouldServiceRequest(url, resource_context,
+                                             render_process_id);
 }
 
 bool FaviconSource::HandleMissingResource(const IconRequest& request) {