Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/autofill/autofill_interactive_uitest.cc

 // Copyright (c) 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 <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.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/profiles/profile.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
@@ skipping 130 matching lines @@
   virtual void OnInsufficientFormData() OVERRIDE {
     OnPersonalDataChanged();
   }
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     infobar_service_ = InfoBarService::FromWebContents(
         browser_->tab_strip_model()->GetActiveWebContents());
-    infobar_service_->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate()->
-        Accept();
+    infobar_service_->infobar_at(0)->AsConfirmInfoBarDelegate()->Accept();
   }
 
   void Wait() {
     if (!alerted_) {
       has_run_message_loop_ = true;
       content::RunMessageLoop();
     }
     PersonalDataManagerFactory::GetForProfile(browser_->profile())->
         RemoveObserver(this);
   }
@@ skipping 642 matching lines @@
                "彼にいくつかの素晴らしいを調達することができます。それから、いくつかの利");
 
   content::WindowedNotificationObserver infobar_observer(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::NotificationService::AllSources());
   ASSERT_NO_FATAL_FAILURE(
       ui_test_utils::NavigateToURL(browser(), url));
 
   // Wait for the translation bar to appear and get it.
   infobar_observer.Wait();
-  TranslateInfoBarDelegate* delegate =
-      InfoBarService::FromWebContents(GetWebContents())->infobar_at(0)->
-          delegate()->AsTranslateInfoBarDelegate();
+  TranslateInfoBarDelegate* delegate = InfoBarService::FromWebContents(
+      GetWebContents())->infobar_at(0)->AsTranslateInfoBarDelegate();
   ASSERT_TRUE(delegate);
   EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
             delegate->infobar_type());
 
   // Simulate translation button press.
   delegate->Translate();
 
   content::WindowedNotificationObserver translation_observer(
       chrome::NOTIFICATION_PAGE_TRANSLATED,
       content::NotificationService::AllSources());
@@ skipping 237 matching lines @@
   ASSERT_TRUE(content::ExecuteScript(
       GetRenderViewHost(),
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
 }
 
 }  // namespace autofill