Revert of mac: Toolbar renders incorrectly when downloads bar is open.

chrome/browser/ui/cocoa/browser_window_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 "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
-#import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
@@ skipping 202 matching lines @@
   [controller_ installIncognitoBadge];
   NSRect newTabFrame = [[controller_ tabStripView] frame];
   EXPECT_GT(tabFrame.size.width, newTabFrame.size.width);
 
   controller_.release();
 }
 #endif
 
 namespace {
 
-// Returns the frame of the view in window coordinates.
-NSRect FrameInWindowForView(NSView* view) {
-  return [[view superview] convertRect:[view frame] toView:nil];
-}
-
-// Whether the view's frame is within the bounds of the superview.
-BOOL ViewContainmentValid(NSView* view) {
-  if (NSIsEmptyRect([view frame]))
-    return true;
-
-  return NSContainsRect([[view superview] bounds], [view frame]);
-}
-
-// Checks the view hierarchy rooted at |view| to ensure that each view is
-// properly contained.
-BOOL ViewHierarchyContainmentValid(NSView* view) {
-  // TODO(erikchen): Fix these views to have correct containment.
-  // http://crbug.com/397665.
-  if ([view isKindOfClass:NSClassFromString(@"DownloadShelfView")])
-    return YES;
-  if ([view isKindOfClass:NSClassFromString(@"BookmarkBarToolbarView")])
-    return YES;
-  if ([view isKindOfClass:NSClassFromString(@"BrowserActionsContainerView")])
-    return YES;
-
-  if (!ViewContainmentValid(view)) {
-    LOG(ERROR) << "View violates containment: " <<
-        [[view description] UTF8String];
-    return false;
-  }
-
-  for (NSView* subview in [view subviews]) {
-    BOOL result = ViewHierarchyContainmentValid(subview);
-    if (!result)
-      return false;
-  }
-
-  return true;
-}
-
 // Verifies that the toolbar, infobar, tab content area, and download shelf
 // completely fill the area under the tabstrip.
 void CheckViewPositions(BrowserWindowController* controller) {
-  EXPECT_TRUE(ViewHierarchyContainmentValid([[controller window] contentView]));
-
-  NSRect contentView = FrameInWindowForView([[controller window] contentView]);
-  NSRect tabstrip = FrameInWindowForView([controller tabStripView]);
-  NSRect toolbar = FrameInWindowForView([controller toolbarView]);
-  NSRect infobar = FrameInWindowForView([controller infoBarContainerView]);
-  NSRect tabContent = FrameInWindowForView([controller tabContentArea]);
-  NSRect download = FrameInWindowForView([[controller downloadShelf] view]);
+  NSRect contentView = [[[controller window] contentView] bounds];
+  NSRect tabstrip = [[controller tabStripView] frame];
+  NSRect toolbar = [[controller toolbarView] frame];
+  NSRect infobar = [[controller infoBarContainerView] frame];
+  NSRect contentArea = [[controller tabContentArea] frame];
+  NSRect download = [[[controller downloadShelf] view] frame];
 
   EXPECT_EQ(NSMinY(contentView), NSMinY(download));
-  EXPECT_EQ(NSMaxY(download), NSMinY(tabContent));
-  EXPECT_EQ(NSMaxY(tabContent), NSMinY(infobar));
+  EXPECT_EQ(NSMaxY(download), NSMinY(contentArea));
+  EXPECT_EQ(NSMaxY(contentArea), NSMinY(infobar));
 
   // Bookmark bar frame is random memory when hidden.
   if ([controller bookmarkBarVisible]) {
     NSRect bookmark = [[controller bookmarkView] frame];
     EXPECT_EQ(NSMaxY(infobar), NSMinY(bookmark));
     EXPECT_EQ(NSMaxY(bookmark), NSMinY(toolbar));
     EXPECT_FALSE([[controller bookmarkView] isHidden]);
   } else {
     EXPECT_EQ(NSMaxY(infobar), NSMinY(toolbar));
     EXPECT_TRUE([[controller bookmarkView] isHidden]);
@@ skipping 613 matching lines @@
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   [[testFullscreenWindow_ contentView] cr_setWantsLayer:YES];
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */