[Mac[ FullscreenToolbarController Refactor

chrome/browser/ui/cocoa/browser_window_controller_browsertest.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 <stddef.h>
 #import "base/mac/mac_util.h"
 
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
-#import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
+#import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/infobar_container_delegate.h"
@@ skipping 299 matching lines @@
     timer.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(15),
         base::Bind(&CheckBookmarkBarAnimation,
                    [controller() bookmarkBarController],
                    runner->QuitClosure()));
     runner->Run();
   }
 
   void VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle style) {
-    EXPECT_EQ([[controller() fullscreenToolbarController] toolbarStyle], style);
+    EXPECT_EQ(
+        [[controller() fullscreenToolbarController] computeLayout].toolbarStyle,
+        style);
 
     NSRect toolbarFrame = [[[controller() toolbarController] view] frame];
     NSRect screenFrame = [[[controller() window] screen] frame];
     if (style == FullscreenToolbarStyle::TOOLBAR_PRESENT)
       EXPECT_LE(NSMaxY(toolbarFrame), NSMaxY(screenFrame));
     else
       EXPECT_GE(NSMinY(toolbarFrame), NSMaxY(screenFrame));
   }
 
   NSInteger GetExpectedTopInfoBarTipHeight() {
@@ skipping 428 matching lines @@
   EXPECT_FALSE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
   [fullscreenToolbarController resetToolbarFlag];
 
   // Switch to a non-NTP tab.
   TabStripModel* model = browser()->tab_strip_model();
   model->ActivateTabAt(1, true);
   ASSERT_FALSE([[controller() toolbarController] isLocationBarFocused]);
   EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
   [fullscreenToolbarController resetToolbarFlag];
 }