Make content::ResourceContext be a real interface like the rest of the Content API (i.e. don't ha...

content/browser/worker_host/worker_service_impl.cc

 // Copyright (c) 2011 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/worker_host/worker_service_impl.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
   // the queued workers, or a renderer has shut down, in which case it doesn't
   // affect anything.  We call this function in both scenarios because then we
   // don't have to keep track which filters are from worker processes.
   TryStartingQueuedWorker();
 }
 
 void WorkerServiceImpl::CreateWorker(
     const ViewHostMsg_CreateWorker_Params& params,
     int route_id,
     WorkerMessageFilter* filter,
-    const ResourceContext& resource_context) {
+    ResourceContext* resource_context) {
   // Generate a unique route id for the browser-worker communication that's
   // unique among all worker processes.  That way when the worker process sends
   // a wrapped IPC message through us, we know which WorkerProcessHost to give
   // it to.
   WorkerProcessHost::WorkerInstance instance(
       params.url,
       params.name,
       next_worker_route_id(),
       0,
       params.script_resource_appcache_id,
-      &resource_context);
+      resource_context);
   instance.AddFilter(filter, route_id);
   instance.worker_document_set()->Add(
       filter, params.document_id, filter->render_process_id(),
       params.render_view_route_id);
 
   CreateWorkerFromInstance(instance);
 }
 
 void WorkerServiceImpl::LookupSharedWorker(
     const ViewHostMsg_CreateWorker_Params& params,
     int route_id,
     WorkerMessageFilter* filter,
-    const ResourceContext* resource_context,
+    ResourceContext* resource_context,
     bool* exists,
     bool* url_mismatch) {
   *exists = true;
   WorkerProcessHost::WorkerInstance* instance = FindSharedWorkerInstance(
       params.url, params.name, resource_context);
 
   if (!instance) {
     // If no worker instance currently exists, we need to create a pending
     // instance - this is to make sure that any subsequent lookups passing a
     // mismatched URL get the appropriate url_mismatch error at lookup time.
@@ skipping 162 matching lines @@
     // renderers) but when we do, we'll need to add code to pass in the current
     // worker's document set for nested workers.
     if (!worker->Init(first_filter->render_process_id())) {
       delete worker;
       return false;
     }
   }
 
   // TODO(michaeln): As written, test can fail per my earlier comment in
   // this method, but that's a bug.
-  // DCHECK(worker->request_context() == instance.request_context());
+  // DCHECK(worker->request_context() == instance.GetRequestContext());
 
   worker->CreateWorker(instance);
   FOR_EACH_OBSERVER(
       WorkerServiceObserver, observers_,
       WorkerCreated(instance.url(), instance.name(), worker->GetData().id,
                     instance.worker_route_id()));
   WorkerDevToolsManager::GetInstance()->WorkerCreated(worker, instance);
   return true;
 }
 
@@ skipping 193 matching lines @@
     int worker_route_id) {
   WorkerDevToolsManager::GetInstance()->WorkerDestroyed(
       process, worker_route_id);
   FOR_EACH_OBSERVER(WorkerServiceObserver, observers_,
                     WorkerDestroyed(process->GetData().id, worker_route_id));
 }
 
 WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindSharedWorkerInstance(
     const GURL& url,
     const string16& name,
-    const ResourceContext* resource_context) {
+    ResourceContext* resource_context) {
   for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
     for (WorkerProcessHost::Instances::iterator instance_iter =
              iter->mutable_instances().begin();
          instance_iter != iter->mutable_instances().end();
          ++instance_iter) {
       if (instance_iter->Matches(url, name, resource_context))
         return &(*instance_iter);
     }
   }
   return NULL;
 }
 
 WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindPendingInstance(
     const GURL& url,
     const string16& name,
-    const ResourceContext* resource_context) {
+    ResourceContext* resource_context) {
   // Walk the pending instances looking for a matching pending worker.
   for (WorkerProcessHost::Instances::iterator iter =
            pending_shared_workers_.begin();
        iter != pending_shared_workers_.end();
        ++iter) {
     if (iter->Matches(url, name, resource_context)) {
       return &(*iter);
     }
   }
   return NULL;
 }
 
 
 void WorkerServiceImpl::RemovePendingInstances(
     const GURL& url,
     const string16& name,
-    const ResourceContext* resource_context) {
+    ResourceContext* resource_context) {
   // Walk the pending instances looking for a matching pending worker.
   for (WorkerProcessHost::Instances::iterator iter =
            pending_shared_workers_.begin();
        iter != pending_shared_workers_.end(); ) {
     if (iter->Matches(url, name, resource_context)) {
       iter = pending_shared_workers_.erase(iter);
     } else {
       ++iter;
     }
   }
 }
 
 WorkerProcessHost::WorkerInstance* WorkerServiceImpl::CreatePendingInstance(
     const GURL& url,
     const string16& name,
-    const ResourceContext* resource_context) {
+    ResourceContext* resource_context) {
   // Look for an existing pending shared worker.
   WorkerProcessHost::WorkerInstance* instance =
       FindPendingInstance(url, name, resource_context);
   if (instance)
     return instance;
 
   // No existing pending worker - create a new one.
   WorkerProcessHost::WorkerInstance pending(url, true, name, resource_context);
   pending_shared_workers_.push_back(pending);
   return &pending_shared_workers_.back();
 }
 
 }  // namespace content