Infobar system refactor.

chrome/test/ppapi/ppapi_test.h

 // 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.
 
 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_
 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_
 
-#include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/javascript_test_observer.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 namespace content {
 class RenderViewHost;
@@ skipping 37 matching lines @@
   void RunTestViaHTTP(const std::string& test_case);
   void RunTestWithSSLServer(const std::string& test_case);
   void RunTestWithWebSocketServer(const std::string& test_case);
   void RunTestIfAudioOutputAvailable(const std::string& test_case);
   void RunTestViaHTTPIfAudioOutputAvailable(const std::string& test_case);
   std::string StripPrefixes(const std::string& test_name);
 
  protected:
   class InfoBarObserver : public content::NotificationObserver {
    public:
-    InfoBarObserver();
+    explicit InfoBarObserver(PPAPITestBase* test_base);
     ~InfoBarObserver();
 
+    void ExpectInfoBarAndAccept(bool should_accept);
+
+   private:
+    // content::NotificationObserver:
     virtual void Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) OVERRIDE;
 
-    void ExpectInfoBarAndAccept(bool should_accept);
+    void VerifyInfoBarState();
 
-   private:
     content::NotificationRegistrar registrar_;
-    std::list<bool> expected_infobars_;
+    PPAPITestBase* test_base_;
+    bool expecting_infobar_;
+    bool should_accept_;
   };
 
   // Runs the test for a tab given the tab that's already navigated to the
   // given URL.
   void RunTestURL(const GURL& test_url);
   // Gets the URL of the the given |test_case| for the given HTTP test server.
   // If |extra_params| is non-empty, it will be appended as URL parameters.
   GURL GetTestURL(const net::SpawnedTestServer& http_server,
                   const std::string& test_case,
                   const std::string& extra_params);
@@ skipping 61 matching lines @@
                                  const std::string& test_case) OVERRIDE;
 };
 
 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
  public:
   // PPAPITestBase override:
   virtual void SetUpOnMainThread() OVERRIDE;
 };
 
 #endif  // CHROME_TEST_PPAPI_PPAPI_TEST_H_