Revert 238283 "Infobar system refactor."

trunk/src/chrome/test/ppapi/ppapi_test.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 "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
@@ skipping 91 matching lines @@
   ASSERT_TRUE(web_contents != NULL);
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   ASSERT_TRUE(infobar_service != NULL);
 
   EXPECT_EQ(expecting_infobar_ ? 1U : 0U, infobar_service->infobar_count());
   if (!expecting_infobar_)
     return;
   expecting_infobar_ = false;
 
-  InfoBar* infobar = infobar_service->infobar_at(0);
-  ConfirmInfoBarDelegate* delegate =
-      infobar->delegate()->AsConfirmInfoBarDelegate();
+  InfoBarDelegate* infobar = infobar_service->infobar_at(0);
+  ConfirmInfoBarDelegate* delegate = infobar->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(delegate != NULL);
   if (should_accept_)
     delegate->Accept();
   else
     delegate->Cancel();
 
   infobar_service->RemoveInfoBar(infobar);
 }
 
 PPAPITestBase::PPAPITestBase() {
@@ skipping 258 matching lines @@
     const std::string& base,
     const std::string& test_case) {
   return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                             test_case.c_str());
 }
 
 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
   // The default content setting for the PPAPI broker is ASK. We purposefully
   // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
 }