Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/apps/app_metro_infobar_delegate_win.cc

 // Copyright 2013 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 "chrome/browser/ui/apps/app_metro_infobar_delegate_win.h"
 
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/infobars/infobar.h"
-#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/metro_utils/metro_chrome_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_icon_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 14 matching lines @@
   // Chrome should never get here via the Ash desktop, so only look for browsers
   // on the native desktop.
   chrome::ScopedTabbedBrowserDisplayer displayer(
       profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   // Create a new tab at about:blank, and add the infobar.
   content::OpenURLParams params(GURL(content::kAboutBlankURL),
       content::Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
       false);
   content::WebContents* web_contents = displayer.browser()->OpenURL(params);
-  InfoBarService::FromWebContents(web_contents)->AddInfoBar(
-      ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
-          new AppMetroInfoBarDelegateWin(mode, extension_id))));
+  InfoBarService* info_bar_service =
+      InfoBarService::FromWebContents(web_contents);
+  info_bar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new AppMetroInfoBarDelegateWin(info_bar_service, mode, extension_id)));
 
   // Use PostTask because we can get here in a COM SendMessage, and
   // ActivateApplication can not be sent nested (returns error
   // RPC_E_CANTCALLOUT_ININPUTSYNCCALL).
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(base::IgnoreResult(chrome::ActivateMetroChrome)));
 }
 
 AppMetroInfoBarDelegateWin::AppMetroInfoBarDelegateWin(
+    InfoBarService* info_bar_service,
     Mode mode,
     const std::string& extension_id)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(info_bar_service),
       mode_(mode),
       extension_id_(extension_id) {
   DCHECK_EQ(mode_ == SHOW_APP_LIST, extension_id_.empty());
 }
 
 AppMetroInfoBarDelegateWin::~AppMetroInfoBarDelegateWin() {}
 
 int AppMetroInfoBarDelegateWin::GetIconID() const {
   return GetAppListIconResourceId();
 }
@@ skipping 37 matching lines @@
 
 bool AppMetroInfoBarDelegateWin::LinkClicked(
     WindowOpenDisposition disposition) {
   web_contents()->OpenURL(content::OpenURLParams(
       GURL("https://support.google.com/chrome/?p=ib_redirect_to_desktop"),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }