[Mac[ FullscreenToolbarController Refactor

chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_controller.mm

 // Copyright 2016 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/fullscreen/fullscreen_toolbar_visibility_lock_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h"
-#import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
+#import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h"
 
 @interface FullscreenToolbarVisibilityLockController () {
   // Stores the objects that are locking the toolbar visibility.
   base::scoped_nsobject<NSMutableSet> visibilityLocks_;
 
   // Our owner.
   FullscreenToolbarController* owner_;  // weak
 
   // The object managing the fullscreen toolbar's animations.
   FullscreenToolbarAnimationController* animationController_;  // weak
@@ skipping 29 matching lines @@
 
 - (void)lockToolbarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate {
   if ([self isToolbarVisibilityLockedForOwner:owner])
     return;
 
   [visibilityLocks_ addObject:owner];
 
   if (animate)
     animationController_->AnimateToolbarIn();
   else
-    [owner_ updateToolbar];
+    [owner_ updateToolbarLayout];
 }
 
 - (void)releaseToolbarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate {
   if (![self isToolbarVisibilityLockedForOwner:owner])
     return;
 
   [visibilityLocks_ removeObject:owner];
 
   if (animate)
     animationController_->AnimateToolbarOutIfPossible();
   else
-    [owner_ updateToolbar];
+    [owner_ updateToolbarLayout];
 }
 
 @end