Infobar system 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"
 
 #import "base/mac/mac_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.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"
@@ skipping 38 matching lines @@
   VIEW_ID_TOOLBAR,
   VIEW_ID_BOOKMARK_BAR,
   VIEW_ID_INFO_BAR,
   VIEW_ID_FIND_BAR,
   VIEW_ID_DOWNLOAD_SHELF,
   VIEW_ID_TAB_CONTENT_AREA,
   VIEW_ID_FULLSCREEN_FLOATING_BAR,
   VIEW_ID_COUNT,
 };
 
-// A very simple info bar implementation used to show an infobar on the browser
-// window.
-class DummyInfoBar : public ConfirmInfoBarDelegate {
- public:
-  explicit DummyInfoBar(InfoBarService* service)
-      : ConfirmInfoBarDelegate(service) {
-  }
-
-  virtual ~DummyInfoBar() {
-  }
-
-  virtual string16 GetMessageText() const OVERRIDE {
-    return string16();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DummyInfoBar);
-};
-
 }  // namespace
 
 class BrowserWindowControllerTest : public InProcessBrowserTest {
  public:
   BrowserWindowControllerTest() : InProcessBrowserTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     [[controller() bookmarkBarController] setStateAnimationsEnabled:NO];
     [[controller() bookmarkBarController] setInnerContentAnimationsEnabled:NO];
   }
 
   BrowserWindowController* controller() const {
     return [BrowserWindowController browserWindowControllerForWindow:
         browser()->window()->GetNativeWindow()];
   }
 
-  void ShowInfoBar() {
-    content::WebContents* web_contents =
-        browser()->tab_strip_model()->GetActiveWebContents();
-    InfoBarService* service =
-        InfoBarService::FromWebContents(web_contents);
-    scoped_ptr<InfoBarDelegate> info_bar_delegate(new DummyInfoBar(service));
-    service->AddInfoBar(info_bar_delegate.Pass());
+  static void ShowInfoBar(Browser* browser) {
+    SimpleAlertInfoBarDelegate::Create(
+        InfoBarService::FromWebContents(
+            browser->tab_strip_model()->GetActiveWebContents()),
+        0, string16(), false);
   }
 
   NSView* GetViewWithID(ViewID view_id) const {
     switch (view_id) {
       case VIEW_ID_FULLSCREEN_FLOATING_BAR:
         return [controller() floatingBarBackingView];
       case VIEW_ID_TOOLBAR:
         return [[controller() toolbarController] view];
       case VIEW_ID_BOOKMARK_BAR:
         return [[controller() bookmarkBarController] view];
@@ skipping 218 matching lines @@
             defaultAlertFrame.size.height);
 
   // Close the application window.
   popup_browser->tab_strip_model()->CloseSelectedTabs();
   [popupController close];
 }
 
 // Verify that the info bar tip is hidden when the toolbar is not visible.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        InfoBarTipHiddenForWindowWithoutToolbar) {
-  ShowInfoBar();
+  ShowInfoBar(browser());
   EXPECT_FALSE(
       [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]);
 
   gfx::Rect initial_bounds(0, 0, 400, 400);
   OpenAppShortcutWindow(browser()->profile(), GURL("about:blank"),
                         initial_bounds);
   Browser* popup_browser = BrowserList::GetInstance(
       chrome::HOST_DESKTOP_TYPE_NATIVE)->GetLastActive();
   NSWindow* popupWindow = popup_browser->window()->GetNativeWindow();
   BrowserWindowController* popupController =
       [BrowserWindowController browserWindowControllerForWindow:popupWindow];
   EXPECT_FALSE([popupController hasToolbar]);
 
   // Show infobar for controller.
-  content::WebContents* web_contents =
-      popup_browser->tab_strip_model()->GetActiveWebContents();
-  InfoBarService* service = InfoBarService::FromWebContents(web_contents);
-  scoped_ptr<InfoBarDelegate> info_bar_delegate(new DummyInfoBar(service));
-  service->AddInfoBar(info_bar_delegate.Pass());
+  ShowInfoBar(popup_browser);
   EXPECT_TRUE(
       [[popupController infoBarContainerController]
           shouldSuppressTopInfoBarTip]);
 }
 
 // Verify that AllowOverlappingViews is set while the history overlay is
 // visible.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        AllowOverlappingViewsHistoryOverlay) {
   content::WebContentsView* web_contents_view =
       browser()->tab_strip_model()->GetActiveWebContents()->GetView();
   EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
 
   base::scoped_nsobject<HistoryOverlayController> overlay(
       [[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
   [overlay showPanelForView:web_contents_view->GetNativeView()];
   EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
 
   overlay.reset();
   EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
 }