Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/geolocation/geolocation_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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 123 matching lines @@
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   void AddWatchAndWaitForNotification(content::RenderViewHost* render_view_host,
                                       const std::string& iframe_xpath);
 
   bool has_infobar() const { return !!infobar_; }
-  InfoBar* infobar() { return infobar_; }
+  InfoBarDelegate* infobar() { return infobar_; }
 
  private:
   content::NotificationRegistrar registrar_;
   bool wait_for_infobar_;
-  InfoBar* infobar_;
+  InfoBarDelegate* infobar_;
   bool navigation_started_;
   bool navigation_completed_;
   std::string javascript_response_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationNotificationObserver);
 };
 
 GeolocationNotificationObserver::GeolocationNotificationObserver(
     bool wait_for_infobar)
     : wait_for_infobar_(wait_for_infobar),
@@ skipping 17 matching lines @@
 
 GeolocationNotificationObserver::~GeolocationNotificationObserver() {
 }
 
 void GeolocationNotificationObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED) {
     infobar_ = content::Details<InfoBar::AddedDetails>(details).ptr();
-    ASSERT_FALSE(infobar_->delegate()->GetIcon().IsEmpty());
-    ASSERT_TRUE(infobar_->delegate()->AsConfirmInfoBarDelegate());
+    ASSERT_FALSE(infobar_->GetIcon().IsEmpty());
+    ASSERT_TRUE(infobar_->AsConfirmInfoBarDelegate());
   } else if (type == content::NOTIFICATION_DOM_OPERATION_RESPONSE) {
     content::Details<DomOperationNotificationDetails> dom_op_details(details);
     javascript_response_ = dom_op_details->json;
     LOG(WARNING) << "javascript_response " << javascript_response_;
   } else if ((type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) ||
              (type == content::NOTIFICATION_LOAD_START)) {
     navigation_started_ = true;
   } else if ((type == content::NOTIFICATION_LOAD_STOP) && navigation_started_) {
     navigation_started_ = false;
     navigation_completed_ = true;
@@ skipping 92 matching lines @@
                                             WebContents* web_contents);
 
   // Executes |function| and checks that the return value matches |expected|.
   void CheckStringValueFromJavascript(const std::string& expected,
                                       const std::string& function);
 
   // Sets a new position and sends a notification with the new position.
   void NotifyGeoposition(double latitude, double longitude);
 
  private:
-  InfoBar* infobar_;
+  InfoBarDelegate* infobar_;
   Browser* current_browser_;
   // path element of a URL referencing the html content for this test.
   std::string html_for_tests_;
   // This member defines the iframe (or top-level page, if empty) where the
   // javascript calls will run.
   std::string iframe_xpath_;
   // The current url for the top level page.
   GURL current_url_;
   // If not empty, the GURLs for the iframes loaded by LoadIFrames().
   std::vector<GURL> iframe_urls_;
@@ skipping 88 matching lines @@
   const ContentSettingsUsagesState& usages_state =
       content_settings->geolocation_usages_state();
   size_t state_map_size = usages_state.state_map().size();
   ASSERT_TRUE(infobar_);
   LOG(WARNING) << "will set infobar response";
   {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&web_contents->GetController()));
     if (allowed)
-      infobar_->delegate()->AsConfirmInfoBarDelegate()->Accept();
+      infobar_->AsConfirmInfoBarDelegate()->Accept();
     else
-      infobar_->delegate()->AsConfirmInfoBarDelegate()->Cancel();
+      infobar_->AsConfirmInfoBarDelegate()->Cancel();
     observer.Wait();
   }
 
   InfoBarService::FromWebContents(web_contents)->RemoveInfoBar(infobar_);
   LOG(WARNING) << "infobar response set";
   infobar_ = NULL;
   EXPECT_GT(usages_state.state_map().size(), state_map_size);
   GURL requesting_origin(requesting_url.GetOrigin());
   EXPECT_EQ(1U, usages_state.state_map().count(requesting_origin));
   ContentSetting expected_setting =
@@ skipping 314 matching lines @@
 
   set_iframe_xpath("//iframe[@id='iframe_2']");
   AddGeolocationWatch(false);
 
   std::string script =
       "window.domAutomationController.send(window.close());";
   bool result = content::ExecuteScript(
       current_browser()->tab_strip_model()->GetActiveWebContents(), script);
   EXPECT_EQ(result, true);
 }