Refactor navigator.connect code to make it more flexible.

content/child/navigator_connect/navigator_connect_provider.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/child/navigator_connect/navigator_connect_provider.h"
 
 #include "base/lazy_instance.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/navigator_connect_messages.h"
-#include "content/common/navigator_connect_types.h"
+#include "content/public/common/navigator_connect_client.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace content {
 
 namespace {
 
 base::LazyInstance<base::ThreadLocalPointer<NavigatorConnectProvider>>::Leaky
     g_provider_tls = LAZY_INSTANCE_INITIALIZER;
 
 NavigatorConnectProvider* const kHasBeenDeleted =
@@ skipping 15 matching lines @@
 }
 
 void SendConnectMessage(const scoped_refptr<ThreadSafeSender>& sender,
                         int thread_id,
                         int request_id,
                         const GURL& target_url,
                         const GURL& origin,
                         int message_port_id) {
   sender->Send(new NavigatorConnectHostMsg_Connect(
       thread_id, request_id,
-      CrossOriginServiceWorkerClient(target_url, origin, message_port_id)));
+      NavigatorConnectClient(target_url, origin, message_port_id)));
 }
 
 }  // namespace
 
 NavigatorConnectProvider::NavigatorConnectProvider(
     ThreadSafeSender* thread_safe_sender,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_loop)
     : thread_safe_sender_(thread_safe_sender), main_loop_(main_loop) {
   g_provider_tls.Pointer()->Set(this);
 }
@@ skipping 73 matching lines @@
     callbacks->onError();
   }
   requests_.Remove(request_id);
 }
 
 void NavigatorConnectProvider::OnWorkerRunLoopStopped() {
   delete this;
 }
 
 }  // namespace content