Revert r30784

TBR=rafaelw@chromium.org

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

1 files changed, 21 insertions, 17 deletions

diff --git a/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/page.js b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/page.js
index 24f7a9a..34d27fc 100644
--- a/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/page.js
+++ b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/page.js
@@ -3,24 +3,28 @@ if (typeof(contentWindow) != 'undefined') {
   win = contentWindow;
 }
 
-chrome.extension.onConnect.addListener(function(port) {
-  console.log('connected');
-  port.onMessage.addListener(function(msg) {
-    console.log('got ' + msg);
-    if (msg.testPostMessage) {
-      port.postMessage({success: true});
-    } else if (msg.testPostMessageFromTab) {
-      testPostMessageFromTab(port);
-    } else if (msg.testDisconnect) {
-      port.disconnect();
-    } else if (msg.testDisconnectOnClose) {
-      win.location = "about:blank";
-    } else if (msg.testPortName) {
-      port.postMessage({portName:port.name});
-    }
-    // Ignore other messages since they are from us.
+win.onload = function() {
+  // Do this in an onload handler because I'm not sure if chrome.extension
+  // is available before then.
+  chrome.extension.onConnect.addListener(function(port) {
+    console.log('connected');
+    port.onMessage.addListener(function(msg) {
+      console.log('got ' + msg);
+      if (msg.testPostMessage) {
+        port.postMessage({success: true});
+      } else if (msg.testPostMessageFromTab) {
+        testPostMessageFromTab(port);
+      } else if (msg.testDisconnect) {
+        port.disconnect();
+      } else if (msg.testDisconnectOnClose) {
+        win.location = "about:blank";
+      } else if (msg.testPortName) {
+        port.postMessage({portName:port.name});
+      }
+      // Ignore other messages since they are from us.
+    });
   });
-});
+};
 
 // Tests that postMessage to the extension and its response works.
 function testPostMessageFromTab(origPort) {