Reverting 24700.

chrome/browser/cocoa/browser_window_controller_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.
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/browser_window_controller.h"
@@ skipping 161 matching lines @@
 
 @implementation BrowserWindowControllerResizePong
 @end
 
 // Test to make sure resizing and relaying-out subviews works correctly.
 TEST_F(BrowserWindowControllerTest, TestResizeViews) {
   TabStripView* tabstrip = [controller_ tabStripView];
   NSView* contentView = [[tabstrip window] contentView];
   NSView* toolbar = [controller_ toolbarView];
   NSView* infobar = [controller_ infoBarContainerView];
+  NSView* contentArea = [controller_ tabContentArea];
 
   // We need to muck with the views a bit to put us in a consistent state before
   // we start resizing.  In particular, we need to move the tab strip to be
   // immediately above the content area, since we layout views to be directly
   // under the tab strip.  We also explicitly set the contentView's frame to be
   // 800x600.
   [contentView setFrame:NSMakeRect(0, 0, 800, 600)];
   NSRect tabstripFrame = [tabstrip frame];
   tabstripFrame.origin.y = NSMaxY([contentView frame]);
   [tabstrip setFrame:tabstripFrame];
 
   // Make sure each view is as tall as we expect.
-  ASSERT_EQ(36, NSHeight([toolbar frame]));
+  ASSERT_EQ(39, NSHeight([toolbar frame]));
   ASSERT_EQ(0, NSHeight([infobar frame]));
 
-
-  // TODO(rohitrao):rewrite and reenable
-#if 0
-  NSView* contentArea = [controller_ tabContentArea];
-
   // Force a layout and check each view's frame.
   // contentView should be at 0,0 800x600
   // contentArea should be at 0,0 800x561
   // infobar should be at 0,561 800x0
   // toolbar should be at 0,561 800x39
   [controller_ layoutSubviews];
   EXPECT_TRUE(NSEqualRects([contentView frame], NSMakeRect(0, 0, 800, 600)));
   EXPECT_TRUE(NSEqualRects([contentArea frame], NSMakeRect(0, 0, 800, 561)));
   EXPECT_TRUE(NSEqualRects([infobar frame], NSMakeRect(0, 561, 800, 0)));
   EXPECT_TRUE(NSEqualRects([toolbar frame], NSMakeRect(0, 561, 800, 39)));
@@ skipping 40 matching lines @@
   // contentArea should be at 0,30 800x531
   // infobar should be at 0,561 800x0
   // toolbar should be at 0,561 800x39
   [controller_ resizeView:infobar newHeight:0];
   [controller_ resizeView:toolbar newHeight:39];
   EXPECT_TRUE(NSEqualRects([contentView frame], NSMakeRect(0, 0, 800, 600)));
   EXPECT_TRUE(NSEqualRects([download frame], NSMakeRect(0, 0, 800, 30)));
   EXPECT_TRUE(NSEqualRects([contentArea frame], NSMakeRect(0, 30, 800, 531)));
   EXPECT_TRUE(NSEqualRects([infobar frame], NSMakeRect(0, 561, 800, 0)));
   EXPECT_TRUE(NSEqualRects([toolbar frame], NSMakeRect(0, 561, 800, 39)));
-#endif
 }
 
 TEST_F(BrowserWindowControllerTest, TestTopLeftForBubble) {
   NSPoint p = [controller_ topLeftForBubble];
   NSRect all = [[controller_ window] frame];
 
   // As a sanity check make sure the point is vaguely in the top left
   // of the window.
   EXPECT_GT(p.y, all.origin.y + (all.size.height/2));
   EXPECT_LT(p.x, all.origin.x + (all.size.width/2));
 }
 
 
 /* TODO(???): test other methods of BrowserWindowController */