Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/google/google_url_tracker.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/browser/google/google_url_tracker.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h"
 #include "chrome/browser/google/google_url_tracker_navigation_helper.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 315 matching lines @@
                                              const GURL& search_url) {
   EntryMap::iterator i(entry_map_.find(infobar_service));
   DCHECK(i != entry_map_.end());
   GoogleURLTrackerMapEntry* map_entry = i->second;
   DCHECK(search_url.is_valid());
 
   UnregisterForEntrySpecificNotifications(*map_entry, true);
   if (map_entry->has_infobar_delegate()) {
     map_entry->infobar_delegate()->Update(search_url);
   } else {
-    InfoBar* infobar = infobar_creator_.Run(infobar_service, this, search_url);
-    if (infobar) {
-      map_entry->SetInfoBarDelegate(
-          static_cast<GoogleURLTrackerInfoBarDelegate*>(infobar->delegate()));
-    } else {
+    GoogleURLTrackerInfoBarDelegate* infobar =
+        infobar_creator_.Run(infobar_service, this, search_url);
+    if (infobar)
+      map_entry->SetInfoBarDelegate(infobar);
+    else
       map_entry->Close(false);
-    }
   }
 }
 
 void GoogleURLTracker::OnTabClosed(
     content::NavigationController* navigation_controller) {
   // Because InfoBarService tears itself down on tab destruction, it's possible
   // to get a non-NULL InfoBarService pointer here, depending on which order
   // notifications fired in.  Likewise, the pointer in |entry_map_| (and in its
   // associated MapEntry) may point to deleted memory.  Therefore, if we were to
   // access the InfoBarService* we have for this tab, we'd need to ensure we
@@ skipping 49 matching lines @@
             i->second->navigation_controller())) {
       DCHECK(nav_helper_->IsListeningForNavigationStart());
       return;
     }
   }
   if (nav_helper_->IsListeningForNavigationStart()) {
     DCHECK(!search_committed_);
     nav_helper_->SetListeningForNavigationStart(false);
   }
 }