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

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 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/search/local_ntp_source.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 370 matching lines @@
 
 bool LocalNtpSource::AllowCaching() const {
   // Some resources served by LocalNtpSource, i.e. config.js, are dynamically
   // generated and could differ on each access. To avoid using old cached
   // content on reload, disallow caching here. Otherwise, it fails to reflect
   // newly revised user configurations in the page.
   return false;
 }
 
 bool LocalNtpSource::ShouldServiceRequest(
-    const net::URLRequest* request) const {
+    const GURL& url,
+    content::ResourceContext* resource_context,
+    int render_process_id) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-  DCHECK(request->url().host_piece() == chrome::kChromeSearchLocalNtpHost);
-  if (!InstantIOContext::ShouldServiceRequest(request))
+  DCHECK(url.host_piece() == chrome::kChromeSearchLocalNtpHost);
+  if (!InstantIOContext::ShouldServiceRequest(url, resource_context,
+                                              render_process_id)) {
     return false;
+  }
 
-  if (request->url().SchemeIs(chrome::kChromeSearchScheme)) {
+  if (url.SchemeIs(chrome::kChromeSearchScheme)) {
     std::string filename;
-    webui::ParsePathAndScale(request->url(), &filename, nullptr);
+    webui::ParsePathAndScale(url, &filename, nullptr);
     for (size_t i = 0; i < arraysize(kResources); ++i) {
       if (filename == kResources[i].filename)
         return true;
     }
   }
   return false;
 }
 
 std::string LocalNtpSource::GetContentSecurityPolicyScriptSrc() const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ skipping 76 matching lines @@
       base::Bind(&LocalNtpSource::SetDefaultSearchProviderIsGoogleOnIOThread,
                  weak_ptr_factory_.GetWeakPtr(), is_google));
 }
 
 void LocalNtpSource::SetDefaultSearchProviderIsGoogleOnIOThread(
     bool is_google) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   default_search_provider_is_google_io_thread_ = is_google;
 }