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

content/browser/webui/url_data_manager_backend.cc

 // Copyright (c) 2012 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 "content/browser/webui/url_data_manager_backend.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 662 matching lines @@
 
 bool URLDataManagerBackend::StartRequest(const net::URLRequest* request,
                                          URLRequestChromeJob* job) {
   if (!CheckURLIsValid(request->url()))
     return false;
 
   URLDataSourceImpl* source = GetDataSourceFromURL(request->url());
   if (!source)
     return false;
 
-  if (!source->source()->ShouldServiceRequest(request))
+  const content::ResourceRequestInfo* info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (!source->source()->ShouldServiceRequest(
+          request->url(), info ? info->GetContext() : nullptr,
+          info ? info->GetChildID() : -1)) {
     return false;
+  }
 
   std::string path;
   URLToRequestPath(request->url(), &path);
-  source->source()->WillServiceRequest(request, &path);
 
   // Save this request so we know where to send the data.
   RequestID request_id = next_request_id_++;
   pending_requests_.insert(std::make_pair(request_id, job));
 
   job->set_allow_caching(source->source()->AllowCaching());
   job->set_add_content_security_policy(
       source->source()->ShouldAddContentSecurityPolicy());
   job->set_content_security_policy_script_source(
       source->source()->GetContentSecurityPolicyScriptSrc());
@@ skipping 24 matching lines @@
     DCHECK(header.empty() || header == origin || header == "*" ||
            header == "null");
     job->set_access_control_allow_origin(header);
   }
 
   // Also notifies that the headers are complete.
   job->MimeTypeAvailable(mime_type);
 
   // Look up additional request info to pass down.
   ResourceRequestInfo::WebContentsGetter wc_getter;
-  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   if (info)
     wc_getter = info->GetWebContentsGetterForRequest();
 
   // Forward along the request to the data source.
   scoped_refptr<base::SingleThreadTaskRunner> target_runner =
       source->source()->TaskRunnerForRequestPath(path);
   if (!target_runner) {
     // The DataSource is agnostic to which thread StartDataRequest is called
     // on for this path.  Call directly into it from this thread, the IO
     // thread.
@@ skipping 106 matching lines @@
 
 }  // namespace
 
 net::URLRequestJobFactory::ProtocolHandler* CreateDevToolsProtocolHandler(
     ResourceContext* resource_context,
     bool is_incognito) {
   return new DevToolsJobFactory(resource_context, is_incognito);
 }
 
 }  // namespace content