SharedWorker: Remove message forwarding mechanism

content/browser/shared_worker/shared_worker_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_
 #define CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_
 
 #include <list>
 #include <memory>
 #include <utility>
@@ skipping 27 matching lines @@
 
   // Sends |message| to the SharedWorker.
   bool Send(IPC::Message* message);
 
   // Starts the SharedWorker in the renderer process which is associated with
   // |filter_|.
   void Start(bool pause_on_start);
 
   // Returns true iff the given message from a renderer process was forwarded to
   // the worker.
-  bool FilterMessage(const IPC::Message& message,
-                     SharedWorkerMessageFilter* filter);
+  bool FilterConnectionMessage(int route_id,
+                               int sent_message_port_id,
+                               SharedWorkerMessageFilter* incoming_filter);
 
   // Handles the shutdown of the filter. If the worker has no other client,
   // sends TerminateWorkerContext message to shut it down.
   void FilterShutdown(SharedWorkerMessageFilter* filter);
 
   // Shuts down any shared workers that are no longer referenced by active
   // documents.
   void DocumentDetached(SharedWorkerMessageFilter* filter,
                         unsigned long long document_id);
 
@@ skipping 42 matching lines @@
     void set_message_port_id(int id) { message_port_id_ = id; }
 
    private:
     SharedWorkerMessageFilter* filter_;
     const int route_id_;
     int message_port_id_;
   };
 
   using FilterList = std::list<FilterInfo>;
 
-  // Relays |message| to the SharedWorker. Takes care of parsing the message if
-  // it contains a message port and sending it a valid route id.
-  void RelayMessage(const IPC::Message& message,
-                    SharedWorkerMessageFilter* incoming_filter);
-
   // Return a vector of all the render process/render frame IDs.
   std::vector<std::pair<int, int> > GetRenderFrameIDsForWorker();
 
   void RemoveFilters(SharedWorkerMessageFilter* filter);
   bool HasFilter(SharedWorkerMessageFilter* filter, int route_id) const;
+  void Connect(int route_id,
+               int sent_message_port_id,
+               SharedWorkerMessageFilter* incoming_filter);
   void SetMessagePortID(SharedWorkerMessageFilter* filter,
                         int route_id,
                         int message_port_id);
   void AllowFileSystemResponse(std::unique_ptr<IPC::Message> reply_msg,
                                bool allowed);
+
   std::unique_ptr<SharedWorkerInstance> instance_;
   scoped_refptr<WorkerDocumentSet> worker_document_set_;
   FilterList filters_;
   SharedWorkerMessageFilter* container_render_filter_;
   const int worker_process_id_;
   const int worker_route_id_;
   bool termination_message_sent_;
   bool closed_;
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<SharedWorkerHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedWorkerHost);
 };
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_HOST_H_