Implement chrome.extension.connectExternal and fix various API inconsistencies.

BUG=23583
BUG=17910
TEST=no

Review URL: http://codereview.chromium.org/262016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28565 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 26 insertions, 0 deletions

diff --git a/chrome/test/data/extensions/api_test/connect_external/connect.html b/chrome/test/data/extensions/api_test/connect_external/connect.html
new file mode 100644
index 0000000..cc9def8
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/connect_external/connect.html
@@ -0,0 +1,13 @@
+<script>
+var testId = "bjafgdebaacbbbecmhlhpofkepfkgcpa";
+
+function testConnectExternal() {
+  var port = chrome.extension.connect(testId, {name: "extern"});
+  port.postMessage({testConnectExternal: true});
+  port.onMessage.addListener(function(msg) {
+    var success = msg.success && msg.senderId == location.host;
+    window.domAutomationController.send(success);
+    port.disconnect();
+  });
+}
+</script>
diff --git a/chrome/test/data/extensions/api_test/connect_external/manifest.json b/chrome/test/data/extensions/api_test/connect_external/manifest.json
new file mode 100644
index 0000000..c1b30cb
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/connect_external/manifest.json
@@ -0,0 +1,6 @@
+{
+  "name": "connect_external",
+  "version": "1.0",
+  "description": "Tests connect to an external extension.",
+  "background_page": "test.html"
+}
diff --git a/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/toolstrip.html b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/toolstrip.html
index 84c7db0..fb4c2eb 100644
--- a/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/toolstrip.html
+++ b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/toolstrip.html
@@ -11,6 +11,13 @@ window.onload = function() {
       // Ignore other messages since they are from us.
     });
   });
+  chrome.extension.onConnectExternal.addListener(function(port) {
+    port.onMessage.addListener(function(msg) {
+      if (msg.testConnectExternal) {
+        port.postMessage({success: true, senderId: port.sender.id});
+      }
+    });
+  });
 };
 
 // Tests that postMessage to the tab and its response works.