Merge 286045 "Revert of mac: Fix tab dragging visual bug in Yose..."

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

Index: chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/browser_window_controller_unittest.mm	(revision 286078)
+++ chrome/browser/ui/cocoa/browser_window_controller_unittest.mm	(working copy)
@@ -21,7 +21,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.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"
@@ -616,7 +615,7 @@
   [controller_ addFindBar:bridge.find_bar_cocoa_controller()];
 
   // Test that the Z-order of the find bar is on top of everything.
-  NSArray* subviews = [controller_.chromeContentView subviews];
+  NSArray* subviews = [[[controller_ window] contentView] subviews];
   NSUInteger findBar_index =
       [subviews indexOfObject:[controller_ findBarView]];
   EXPECT_NE(NSNotFound, findBar_index);
@@ -883,7 +882,6 @@
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
-  [[testFullscreenWindow_ contentView] cr_setWantsLayer:YES];
   return testFullscreenWindow_.get();
 }
 @end