2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_messages_unittest.cc b/chrome/browser/extensions/extension_messages_unittest.cc
index 565f664..009d574 100644
--- a/chrome/browser/extensions/extension_messages_unittest.cc
+++ b/chrome/browser/extensions/extension_messages_unittest.cc
@@ -15,7 +15,7 @@ TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) {
   ExecuteJavaScript(
     "var e = new chromium.Extension('foobar');"
     "var port = e.connect();"
-    "port.onmessage.addListener(doOnMessage);"
+    "port.onMessage.addListener(doOnMessage);"
     "port.postMessage({message: 'content ready'});"
     "function doOnMessage(msg, port) {"
     "  alert('content got: ' + msg.val);"
@@ -56,8 +56,8 @@ TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) {
 TEST_F(RenderViewTest, ExtensionMessagesOnConnect) {
   LoadHTML("<body></body>");
   ExecuteJavaScript(
-    "chromium.onconnect.addListener(function (port) {"
-    "  port.onmessage.addListener(doOnMessage);"
+    "chromium.self.onConnect.addListener(function (port) {"
+    "  port.onMessage.addListener(doOnMessage);"
     "  port.postMessage({message: 'onconnect'});"
     "});"
     "function doOnMessage(msg, port) {"
diff --git a/chrome/browser/resources/extensions_toolstrip.css b/chrome/browser/resources/extensions_toolstrip.css
index a8a332d..921f97f 100755
--- a/chrome/browser/resources/extensions_toolstrip.css
+++ b/chrome/browser/resources/extensions_toolstrip.css
@@ -10,6 +10,7 @@ body {
 #main {
   background: -webkit-gradient(linear, left top, left bottom, from(rgb(222, 234, 248)), to(rgb(237, 244, 252)));
   padding-top: 3px;
-  height:19px;
-  overflow:hidden;
+  height: 21px;
+  overflow: hidden;
+  white-space: nowrap;
 }