[Mac] Organize some files into chrome/browser/ui/cocoa/toolbar/....

chrome/browser/extensions/browser_action_test_util_mac.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 "browser_action_test_util.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
-#import "chrome/browser/ui/cocoa/toolbar_controller.h"
+#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
 
 namespace {
 
 BrowserActionsController* GetController(Browser* browser) {
   BrowserWindowCocoa* window =
       static_cast<BrowserWindowCocoa*>(browser->window());
 
   return [[window->cocoa_controller() toolbarController]
@@ skipping 41 matching lines @@
   return !HasPopup();
 }
 
 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
   return gfx::Size(NSSizeToCGSize([ExtensionPopupController minPopupSize]));
 }
 
 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
   return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize]));
 }