SharedWorker: Remove unnecessary indirection in SharedWorkerMessageFilter

content/browser/shared_worker/shared_worker_service_impl.cc

 // 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.
 
 #include "content/browser/shared_worker/shared_worker_service_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 306 matching lines @@
       return blink::WebWorkerCreationErrorSecureContextMismatch;
     return blink::WebWorkerCreationErrorNone;
   }
 
   std::unique_ptr<SharedWorkerPendingInstance> pending_instance(
       new SharedWorkerPendingInstance(std::move(instance)));
   pending_instance->AddRequest(std::move(request));
   return ReserveRenderProcessToCreateWorker(std::move(pending_instance));
 }
 
-void SharedWorkerServiceImpl::ConnectToWorker(
-    int route_id,
-    int sent_message_port_id,
-    SharedWorkerMessageFilter* filter) {
+void SharedWorkerServiceImpl::ConnectToWorker(SharedWorkerMessageFilter* filter,
+                                              int route_id,
+                                              int sent_message_port_id) {
   for (WorkerHostMap::const_iterator iter = worker_hosts_.begin();
        iter != worker_hosts_.end();
        ++iter) {
     if (iter->second->FilterConnectionMessage(route_id, sent_message_port_id,
                                               filter))
       return;
   }
 }
 
 void SharedWorkerServiceImpl::DocumentDetached(
-    unsigned long long document_id,
-    SharedWorkerMessageFilter* filter) {
+    SharedWorkerMessageFilter* filter,
+    unsigned long long document_id) {
   ScopedWorkerDependencyChecker checker(this);
   for (WorkerHostMap::const_iterator iter = worker_hosts_.begin();
        iter != worker_hosts_.end();
        ++iter) {
     iter->second->DocumentDetached(filter, document_id);
   }
 }
 
 void SharedWorkerServiceImpl::WorkerContextClosed(
-    int worker_route_id,
-    SharedWorkerMessageFilter* filter) {
+    SharedWorkerMessageFilter* filter,
+    int worker_route_id) {
   ScopedWorkerDependencyChecker checker(this);
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
     host->WorkerContextClosed();
 }
 
 void SharedWorkerServiceImpl::WorkerContextDestroyed(
-    int worker_route_id,
-    SharedWorkerMessageFilter* filter) {
+    SharedWorkerMessageFilter* filter,
+    int worker_route_id) {
   ScopedWorkerDependencyChecker checker(this);
   ProcessRouteIdPair key(filter->render_process_id(), worker_route_id);
   worker_hosts_.erase(key);
 }
 
 void SharedWorkerServiceImpl::WorkerReadyForInspection(
-    int worker_route_id,
-    SharedWorkerMessageFilter* filter) {
+    SharedWorkerMessageFilter* filter,
+    int worker_route_id) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
     host->WorkerReadyForInspection();
 }
 
 void SharedWorkerServiceImpl::WorkerScriptLoaded(
-    int worker_route_id,
-    SharedWorkerMessageFilter* filter) {
+    SharedWorkerMessageFilter* filter,
+    int worker_route_id) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
     host->WorkerScriptLoaded();
 }
 
 void SharedWorkerServiceImpl::WorkerScriptLoadFailed(
-    int worker_route_id,
-    SharedWorkerMessageFilter* filter) {
+    SharedWorkerMessageFilter* filter,
+    int worker_route_id) {
   ScopedWorkerDependencyChecker checker(this);
   ProcessRouteIdPair key(filter->render_process_id(), worker_route_id);
   if (!base::ContainsKey(worker_hosts_, key))
     return;
   std::unique_ptr<SharedWorkerHost> host(worker_hosts_[key].release());
   worker_hosts_.erase(key);
   host->WorkerScriptLoadFailed();
 }
 
-void SharedWorkerServiceImpl::WorkerConnected(
-    int message_port_id,
-    int worker_route_id,
-    SharedWorkerMessageFilter* filter) {
+void SharedWorkerServiceImpl::WorkerConnected(SharedWorkerMessageFilter* filter,
+                                              int message_port_id,
+                                              int worker_route_id) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
     host->WorkerConnected(message_port_id);
 }
 
-void SharedWorkerServiceImpl::AllowFileSystem(
-    int worker_route_id,
-    const GURL& url,
-    IPC::Message* reply_msg,
-    SharedWorkerMessageFilter* filter) {
+void SharedWorkerServiceImpl::AllowFileSystem(SharedWorkerMessageFilter* filter,
+                                              int worker_route_id,
+                                              const GURL& url,
+                                              IPC::Message* reply_msg) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id)) {
     host->AllowFileSystem(url, base::WrapUnique(reply_msg));
   } else {
     filter->Send(reply_msg);
     return;
   }
 }
 
-void SharedWorkerServiceImpl::AllowIndexedDB(
-    int worker_route_id,
-    const GURL& url,
-    const base::string16& name,
-    bool* result,
-    SharedWorkerMessageFilter* filter) {
+void SharedWorkerServiceImpl::AllowIndexedDB(SharedWorkerMessageFilter* filter,
+                                             int worker_route_id,
+                                             const GURL& url,
+                                             const base::string16& name,
+                                             bool* result) {
   if (SharedWorkerHost* host =
           FindSharedWorkerHost(filter->render_process_id(), worker_route_id))
     host->AllowIndexedDB(url, name, result);
   else
     *result = false;
 }
 
 void SharedWorkerServiceImpl::OnSharedWorkerMessageFilterClosing(
     SharedWorkerMessageFilter* filter) {
   ScopedWorkerDependencyChecker checker(this);
@@ skipping 235 matching lines @@
     UpdateWorkerDependencyFunc new_func) {
   update_worker_dependency_ = new_func;
 }
 
 void SharedWorkerServiceImpl::ChangeTryIncrementWorkerRefCountFuncForTesting(
     bool (*new_func)(int)) {
   s_try_increment_worker_ref_count_ = new_func;
 }
 
 }  // namespace content