Finally remove ResourceRequestInfo::GetAssociatedRenderView. Also remove the shared worker plumbing…

content/browser/worker_host/worker_service_impl.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/worker_host/worker_service_impl.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 302 matching lines @@
       params.url,
       params.name,
       next_worker_route_id(),
       0,
       params.script_resource_appcache_id,
       resource_context,
       partition);
   instance.AddFilter(filter, route_id);
   instance.worker_document_set()->Add(
       filter, params.document_id, filter->render_process_id(),
-      params.render_view_route_id, params.render_frame_route_id);
+      params.render_frame_route_id);
 
   CreateWorkerFromInstance(instance);
 }
 
 void WorkerServiceImpl::LookupSharedWorker(
     const ViewHostMsg_CreateWorker_Params& params,
     int route_id,
     WorkerMessageFilter* filter,
     ResourceContext* resource_context,
     const WorkerStoragePartition& partition,
@@ skipping 24 matching lines @@
     // Add our route ID to the existing instance so we can send messages to it.
     instance->AddFilter(filter, route_id);
 
     // Add the passed filter/document_id to the worker instance.
     // TODO(atwilson): This won't work if the message is from a worker process.
     // We don't support that yet though (this message is only sent from
     // renderers) but when we do, we'll need to add code to pass in the current
     // worker's document set for nested workers.
     instance->worker_document_set()->Add(
         filter, params.document_id, filter->render_process_id(),
-        params.render_view_route_id, params.render_frame_route_id);
+        params.render_frame_route_id);
   }
 }
 
 void WorkerServiceImpl::ForwardToWorker(const IPC::Message& message,
                                         WorkerMessageFilter* filter) {
   for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
     if (iter->FilterMessage(message, filter))
       return;
   }
 
@@ skipping 193 matching lines @@
       // rare in practice so the list will be small.
       i = queued_workers_.begin();
     } else {
       ++i;
     }
   }
 }
 
 bool WorkerServiceImpl::GetRendererForWorker(int worker_process_id,
                                              int* render_process_id,
-                                             int* render_view_id,
                                              int* render_frame_id) const {
   for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
     if (iter.GetData().id != worker_process_id)
       continue;
 
     // This code assumes one worker per process, see function comment in header!
     WorkerProcessHost::Instances::const_iterator first_instance =
         iter->instances().begin();
     if (first_instance == iter->instances().end())
       return false;
 
     WorkerDocumentSet::DocumentInfoSet::const_iterator info =
         first_instance->worker_document_set()->documents().begin();
     *render_process_id = info->render_process_id();
-    *render_view_id = info->render_view_id();
     *render_frame_id = info->render_frame_id();
     return true;
   }
   return false;
 }
 
 const WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindWorkerInstance(
       int worker_process_id) {
   for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
     if (iter.GetData().id != worker_process_id)
@@ skipping 120 matching lines @@
     return instance;
 
   // No existing pending worker - create a new one.
   WorkerProcessHost::WorkerInstance pending(
       url, true, name, resource_context, partition);
   pending_shared_workers_.push_back(pending);
   return &pending_shared_workers_.back();
 }
 
 }  // namespace content