Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/translate/translate_browsertest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_script.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/translate/common/translate_switches.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 63 matching lines @@
       ADD_FAILURE() << "infobar service is not available";
       return NULL;
     }
 
     TranslateInfoBarDelegate* delegate = NULL;
     for (size_t i = 0; i < infobar_service_->infobar_count(); ++i) {
       // Check if the shown infobar is a confirm infobar coming from the
       // |kTranslateSecurityOrigin| flag specified in SetUpCommandLine().
       // This infobar appears in all tests of TranslateBrowserTest and can be
       // ignored here.
-      ConfirmInfoBarDelegate* confirm = infobar_service_->infobar_at(i)->
-          delegate()->AsConfirmInfoBarDelegate();
+      ConfirmInfoBarDelegate* confirm =
+          infobar_service_->infobar_at(i)->AsConfirmInfoBarDelegate();
       if (confirm)
         continue;
 
-      TranslateInfoBarDelegate* translate = infobar_service_->infobar_at(i)->
-          delegate()->AsTranslateInfoBarDelegate();
+      TranslateInfoBarDelegate* translate =
+        infobar_service_->infobar_at(i)->AsTranslateInfoBarDelegate();
       if (translate) {
         EXPECT_FALSE(delegate) << "multiple infobars are shown unexpectedly";
         delegate = translate;
         continue;
       }
 
       // Other infobar should not be shown.
       EXPECT_TRUE(delegate);
     }
     return delegate;
@@ skipping 240 matching lines @@
       GetNonSecureURL(kUpdateLocationAtOnloadTestPath));
 
   // Wait for the page title is changed after the test finished.
   const string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }