Port the Extension Install Bubble changes to Mac

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

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 158 matching lines @@
                           icon:icon_];
   EXPECT_TRUE(controller);
 
   // Initialize window without having to calculate tabstrip locations.
   [controller initializeWindow];
   EXPECT_TRUE([controller window]);
 
   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];
   NSRect msg3Frame = [controller getExtensionInstalledInfoMsgFrame];
   // 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];
 }
 
 TEST_F(ExtensionInstalledBubbleControllerTest, ParentClose) {
   extension_ = CreateExtension(extension_installed_bubble::kBrowserAction);
   ExtensionInstalledBubbleControllerForTest* controller =
       [[ExtensionInstalledBubbleControllerForTest alloc]
           initWithParentWindow:window_
@@ skipping 19 matching lines @@
   // The bubble window goes from visible to not-visible.
   EXPECT_TRUE([bubbleWindow isVisible]);
   [window_ close];
   EXPECT_FALSE([bubbleWindow isVisible]);
 
   [[NSNotificationCenter defaultCenter] removeObserver:observer];
 
   // Check that the appropriate notification was received.
   EXPECT_OCMOCK_VERIFY(observer);
 }