Revert 158830 - Revert 156678 - Native messaging now uses the MessageService back-end.

chrome/renderer/resources/extensions/miscellaneous_bindings.js

 // 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.
 
 // This script contains unprivileged javascript APIs related to chrome
 // extensions.  It is loaded by any extension-related context, such as content
 // scripts or background pages.
 // See user_script_slave.cc for script that is loaded by content scripts only.
 
   require('json_schema');
   require('event_bindings');
   var lastError = require('lastError');
   var miscNatives = requireNative('miscellaneous_bindings');
   var CloseChannel = miscNatives.CloseChannel;
   var PortAddRef = miscNatives.PortAddRef;
   var PortRelease = miscNatives.PortRelease;
   var PostMessage = miscNatives.PostMessage;
   var BindToGC = miscNatives.BindToGC;
 
   var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 
   var processNatives = requireNative('process');
   var manifestVersion = processNatives.GetManifestVersion();
   var extensionId = processNatives.GetExtensionId();
 
   // The reserved channel name for the sendRequest/sendMessage APIs.
   // Note: sendRequest is deprecated.
   chromeHidden.kRequestChannel = "chrome.extension.sendRequest";
   chromeHidden.kMessageChannel = "chrome.extension.sendMessage";
+  chromeHidden.kNativeMessageChannel = "chrome.extension.sendNativeMessage";
 
   // Map of port IDs to port object.
   var ports = {};
 
   // Map of port IDs to chromeHidden.onUnload listeners. Keep track of these
   // to free the onUnload listeners when ports are closed.
   var portReleasers = {};
 
   // Change even to odd and vice versa, to get the other side of a given
   // channel.
@@ skipping 210 matching lines @@
       if (msg) {
         msg = chromeHidden.JSON.parse(msg);
       }
       port.onMessage.dispatch(msg, port);
     }
   };
 
   // Shared implementation used by tabs.sendMessage and extension.sendMessage.
   chromeHidden.Port.sendMessageImpl = function(port, request,
                                                responseCallback) {
-    port.postMessage(request);
+    if (port.name != chromeHidden.kNativeMessageChannel)
+      port.postMessage(request);
 
-    if (port.name == chromeHidden.kMessageChannel && !responseCallback) {
+    if (port.name != chromeHidden.kRequestChannel && !responseCallback) {
       // TODO(mpcomplete): Do this for the old sendRequest API too, after
       // verifying it doesn't break anything.
       // Go ahead and disconnect immediately if the sender is not expecting
       // a response.
       port.disconnect();
       return;
     }
 
     // Ensure the callback exists for the older sendRequest API.
     if (!responseCallback)
@@ skipping 10 matching lines @@
     });
     port.onMessage.addListener(function(response) {
       try {
         responseCallback(response);
       } finally {
         port.disconnect();
         port = null;
       }
     });
   }