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

chrome/browser/thumbnails/thumbnail_list_source.cc

 // Copyright 2014 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/thumbnails/thumbnail_list_source.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 106 matching lines @@
 
 scoped_refptr<base::SingleThreadTaskRunner>
 ThumbnailListSource::TaskRunnerForRequestPath(const std::string& path) const {
   // TopSites can be accessed from the IO thread.
   return thumbnail_service_.get()
              ? nullptr
              : content::URLDataSource::TaskRunnerForRequestPath(path);
 }
 
 bool ThumbnailListSource::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);
 }
 
 bool ThumbnailListSource::ShouldReplaceExistingSource() const {
   return false;
 }
 
 void ThumbnailListSource::OnMostVisitedURLsAvailable(
     const content::URLDataSource::GotDataCallback& callback,
     const history::MostVisitedURLList& mvurl_list) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 22 matching lines @@
   }
   if (num_mv_with_thumb < num_mv) {
     out.push_back("<h2>TopSites URLs without Thumbnails</h2>\n");
     RenderMostVisitedURLList(mvurl_list, base64_encoded_pngs, false, &out);
   }
   out.push_back(kHtmlFooter);
 
   std::string out_html = base::JoinString(out, base::StringPiece());
   callback.Run(base::RefCountedString::TakeString(&out_html));
 }