Infobar system refactor.

chrome/test/gpu/webgl_infobar_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
@@ skipping 107 matching lines @@
   message_queue.ClearQueue();
 
   content::WindowedNotificationObserver infobar_added(
         chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
         content::NotificationService::AllSources());
   SimulateGPUCrash(browser());
   infobar_added.Wait();
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       browser()->tab_strip_model()->GetActiveWebContents());
   ASSERT_EQ(1u, infobar_service->infobar_count());
-  InfoBarDelegate* delegate = infobar_service->infobar_at(0);
+  InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate();
   ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate());
   delegate->AsConfirmInfoBarDelegate()->Cancel();
 
   // The page should reload and another message sent to the
   // DomAutomationController.
   m.clear();
   ASSERT_TRUE(message_queue.WaitForMessage(&m));
   EXPECT_EQ("\"LOADED\"", m);
 }
 
 // There isn't any point in adding a test which calls Accept() on the
 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and
 // there's no concrete event that could be observed in response.