Clean up mac translate bars.

chrome/browser/cocoa/translate/translate_infobar_unittest.mm

 // Copyright (c) 2009 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>
 
 #import "base/scoped_nsobject.h"
 #import "base/string_util.h"
 #import "chrome/app/chrome_dll_resource.h"  // For translate menu command ids.
 #import "chrome/browser/cocoa/browser_test_helper.h"
@@ skipping 85 matching lines @@
     TranslateErrors::Type error = TranslateErrors::NONE;
     if (type == TranslateInfoBarDelegate::kTranslationError)
       error = TranslateErrors::NETWORK;
     infobar_delegate.reset(
         new MockTranslateInfoBarDelegate(type, error, tab_contents.get()));
     [[infobar_controller view] removeFromSuperview];
     scoped_ptr<InfoBar> infobar(infobar_delegate->CreateInfoBar());
     infobar_controller.reset(
         reinterpret_cast<TranslateInfoBarControllerBase*>(
             infobar->controller()));
-    // Need to call this to get the view to load from nib.
+    // We need to set the window to be wide so that the options button
+    // doesn't overlap the other buttons.
+    [test_window() setContentSize:NSMakeSize(2000, 500)];
+    [[infobar_controller view] setFrame:NSMakeRect(0, 0, 2000, 500)];
     [[test_window() contentView] addSubview:[infobar_controller view]];
   }
 };
 
 // Check that we can instantiate a Translate Infobar correctly.
 TEST_F(TranslationInfoBarTest, Instantiate) {
   CreateInfoBar();
   ASSERT_TRUE(infobar_controller.get());
 }
 
@@ skipping 21 matching lines @@
 
   EXPECT_CALL(*infobar_delegate, RevertTranslation()).Times(1);
   [infobar_controller showOriginal:nil];
 }
 
 // Check that items in the options menu are hooked up correctly.
 TEST_F(TranslationInfoBarTest, OptionsMenuItemsHookedUp) {
   EXPECT_CALL(*infobar_delegate, Translate())
     .Times(0);
 
-  [infobar_controller rebuildOptionsMenu];
+  [infobar_controller rebuildOptionsMenu:NO];
   NSMenu* optionsMenu = [infobar_controller optionsMenu];
   NSArray* optionsMenuItems = [optionsMenu itemArray];
 
   EXPECT_EQ([optionsMenuItems count], 5U);
 
   // First item is the options menu button's title, so there's no need to test
   // that the target on that is setup correctly.
   for (NSUInteger i = 1; i < [optionsMenuItems count]; ++i) {
     NSMenuItem* item = [optionsMenuItems objectAtIndex:i];
     EXPECT_EQ([item target], infobar_controller.get());
@@ skipping 49 matching lines @@
     .Times(0);
 
   for (size_t i = 0; i < arraysize(kTranslateToolbarStates); ++i) {
     CreateInfoBar(kTranslateToolbarStates[i]);
     EXPECT_TRUE(
         [infobar_controller verifyLayout]) << "Layout wrong, for state #" << i;
   }
 }
 
 }  // namespace