Move infobar constants and the code that uses them from components/ to chrome/.

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"
 
 #import "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 #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/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"
 #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"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #import "testing/gtest_mac.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/gfx/animation/slide_animation.h"
 
@@ skipping 549 matching lines @@
                        InfoBarTipStretchedWhenBookmarkBarStatusChanged) {
   EXPECT_FALSE([controller() isBookmarkBarVisible]);
   ShowInfoBar(browser());
   // The infobar tip is animated during the infobar is being added, wait until
   // it completes.
   WaitForTopInfoBarAnimationToFinish();
 
   EXPECT_FALSE([[controller() infoBarContainerController]
       shouldSuppressTopInfoBarTip]);
 
-  NSInteger max_tip_height = infobars::InfoBar::kMaximumArrowTargetHeight +
-      infobars::InfoBar::kSeparatorLineHeight;
+  NSInteger max_tip_height =
+      InfoBarContainerDelegate::kMaximumArrowTargetHeight +
+          InfoBarContainerDelegate::kSeparatorLineHeight;
 
   chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
   WaitForBookmarkBarAnimationToFinish();
   EXPECT_TRUE([controller() isBookmarkBarVisible]);
   EXPECT_EQ(std::min(GetExpectedTopInfoBarTipHeight(), max_tip_height),
             [[controller() infoBarContainerController] overlappingTipHeight]);
 
   chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
   WaitForBookmarkBarAnimationToFinish();
   EXPECT_FALSE([controller() isBookmarkBarVisible]);
@@ skipping 10 matching lines @@
   VerifyWindowControlsZOrder();
   [controller() removeOverlay];
   VerifyWindowControlsZOrder();
 
   // Toggle immersive fullscreen, then verify z order. In immersive fullscreen,
   // there are no window controls.
   [controller() enterImmersiveFullscreen];
   [controller() exitImmersiveFullscreen];
   VerifyWindowControlsZOrder();
 }