Port the Extension Install Bubble changes to Mac

chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm

Index: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm	(revision 153650)
+++ chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm	(working copy)
@@ -176,9 +176,10 @@
   int height = [controller calculateWindowHeight];
   // Height should equal the vertical padding + height of all messages.
   int correctHeight = 2 * extension_installed_bubble::kOuterVerticalMargin +
-      extension_installed_bubble::kInnerVerticalMargin +
+      2 * extension_installed_bubble::kInnerVerticalMargin +
       [controller getExtensionInstalledMsgFrame].size.height +
-      [controller getExtensionInstalledInfoMsgFrame].size.height;
+      [controller getExtensionInstalledInfoMsgFrame].size.height +
+      [controller getExtraInfoMsgFrame].size.height;
   EXPECT_EQ(height, correctHeight);
 
   [controller setMessageFrames:height];
@@ -186,11 +187,15 @@
   // Bottom message should start kOuterVerticalMargin pixels above window edge.
   EXPECT_EQ(msg3Frame.origin.y,
       extension_installed_bubble::kOuterVerticalMargin);
+  NSRect msg2Frame = [controller getExtraInfoMsgFrame];
+  // Pageaction message should be kInnerVerticalMargin pixels above bottom msg.
+  EXPECT_EQ(NSMinY(msg2Frame),
+            NSMaxY(msg3Frame) +
+                extension_installed_bubble::kInnerVerticalMargin);
   NSRect msg1Frame = [controller getExtensionInstalledMsgFrame];
-  // Top message should start kInnerVerticalMargin pixels above top of
-  //  extensionInstalled message, because page action message is hidden.
-  EXPECT_EQ(msg1Frame.origin.y,
-            msg3Frame.origin.y + msg3Frame.size.height +
+  // Top message should be kInnerVerticalMargin pixels above BrowserAction msg.
+  EXPECT_EQ(NSMinY(msg1Frame),
+            NSMaxY(msg2Frame) +
                 extension_installed_bubble::kInnerVerticalMargin);
 
   [controller close];