Remove connect message from Native Messaging API

chrome/browser/extensions/api/messaging/message_service.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 "chrome/browser/extensions/api/messaging/message_service.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
@@ skipping 169 matching lines @@
   }
 
   OpenChannelImpl(scoped_ptr<OpenChannelParams>(params));
 }
 
 void MessageService::OpenChannelToNativeApp(
     int source_process_id,
     int source_routing_id,
     int receiver_port_id,
     const std::string& source_extension_id,
-    const std::string& native_app_name,
-    const std::string& channel_name,
-    const std::string& connect_message) {
+    const std::string& native_app_name) {
   content::RenderProcessHost* source =
       content::RenderProcessHost::FromID(source_process_id);
   if (!source)
     return;
 
   WebContents* source_contents = tab_util::GetWebContentsByID(
       source_process_id, source_routing_id);
 
   // Include info about the opener's tab (if it was a tab).
   std::string tab_json = "null";
   if (source_contents) {
     scoped_ptr<DictionaryValue> tab_value(ExtensionTabUtil::CreateTabValue(
         source_contents));
     base::JSONWriter::Write(tab_value.get(), &tab_json);
   }
 
   scoped_ptr<MessageChannel> channel(new MessageChannel());
   channel->opener.reset(new ExtensionMessagePort(source, MSG_ROUTING_CONTROL,
                                                  source_extension_id));
 
-  NativeMessageProcessHost::MessageType type =
-      channel_name == "chrome.runtime.sendNativeMessage" ?
-      NativeMessageProcessHost::TYPE_SEND_MESSAGE_REQUEST :
-      NativeMessageProcessHost::TYPE_CONNECT;
 
-  content::BrowserThread::PostTask(
-      content::BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&NativeMessageProcessHost::Create,
-                 base::WeakPtr<NativeMessageProcessHost::Client>(
-                    weak_factory_.GetWeakPtr()),
-                 native_app_name, connect_message, receiver_port_id,
-                 type,
-                 base::Bind(&MessageService::FinalizeOpenChannelToNativeApp,
-                            weak_factory_.GetWeakPtr(),
-                            receiver_port_id,
-                            channel_name,
-                            base::Passed(&channel),
-                            tab_json)));
-}
-
-void MessageService::FinalizeOpenChannelToNativeApp(
-    int receiver_port_id,
-    const std::string& channel_name,
-    scoped_ptr<MessageChannel> channel,
-    const std::string& tab_json,
-    NativeMessageProcessHost::ScopedHost native_process) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  scoped_ptr<NativeMessageProcessHost> native_process =
+      NativeMessageProcessHost::Create(
+          base::WeakPtr<NativeMessageProcessHost::Client>(
+              weak_factory_.GetWeakPtr()),
+          native_app_name, receiver_port_id);
 
   // Abandon the channel
   if (!native_process.get()) {
     LOG(ERROR) << "Failed to create native process.";
     return;
   }
   channel->receiver.reset(new NativeMessagePort(native_process.release()));
 
   // Keep the opener alive until the channel is closed.
   channel->opener->IncrementLazyKeepaliveCount();
@@ skipping 249 matching lines @@
     return;
 
   params->source = source;
   params->receiver.reset(new ExtensionMessagePort(host->render_process_host(),
                                                   MSG_ROUTING_CONTROL,
                                                   params->target_extension_id));
   OpenChannelImpl(params.Pass());
 }
 
 }  // namespace extensions