Change infobar creation to use a public static Create() method on the infobar delegate classes.

chrome/browser/geolocation/geolocation_infobar_queue_controller.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/geolocation/geolocation_infobar_queue_controller.h"
 
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate.h"
-#include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate_factory.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 23 matching lines @@
                         const GURL& embedder,
                         PermissionDecidedCallback callback);
   ~PendingInfoBarRequest();
 
   bool IsForPair(const GURL& requesting_frame,
                  const GURL& embedder) const;
 
   const GeolocationPermissionRequestID& id() const { return id_; }
   const GURL& requesting_frame() const { return requesting_frame_; }
   bool has_infobar_delegate() const { return !!infobar_delegate_; }
-  GeolocationConfirmInfoBarDelegate* infobar_delegate() {
-      return infobar_delegate_;
-  }
+  InfoBarDelegate* infobar_delegate() { return infobar_delegate_; }
 
   void RunCallback(bool allowed);
   void CreateInfoBarDelegate(GeolocationInfoBarQueueController* controller,
                              const std::string& display_languages);
 
  private:
   GeolocationPermissionRequestID id_;
   GURL requesting_frame_;
   GURL embedder_;
   PermissionDecidedCallback callback_;
-  GeolocationConfirmInfoBarDelegate* infobar_delegate_;
+  InfoBarDelegate* infobar_delegate_;
 
   // Purposefully do not disable copying, as this is stored in STL containers.
 };
 
 GeolocationInfoBarQueueController::PendingInfoBarRequest::PendingInfoBarRequest(
     const GeolocationPermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     PermissionDecidedCallback callback)
     : id_(id),
@@ skipping 14 matching lines @@
 }
 
 void GeolocationInfoBarQueueController::PendingInfoBarRequest::RunCallback(
     bool allowed) {
   callback_.Run(allowed);
 }
 
 void GeolocationInfoBarQueueController::PendingInfoBarRequest::
     CreateInfoBarDelegate(GeolocationInfoBarQueueController* controller,
                           const std::string& display_languages) {
-  infobar_delegate_ = GeolocationConfirmInfoBarDelegateFactory::Create(
+  infobar_delegate_ = GeolocationConfirmInfoBarDelegate::Create(
       GetInfoBarService(id_), controller, id_, requesting_frame_,
       display_languages);
 
 }
 
 
 // GeolocationInfoBarQueueController ------------------------------------------
 
 GeolocationInfoBarQueueController::GeolocationInfoBarQueueController(
     Profile* profile)
@@ skipping 107 matching lines @@
   // caused the delegate to be deleted, so it's not safe to dereference the
   // contents of the delegate. The address of the delegate, however, is OK to
   // use to find the PendingInfoBarRequest to remove because
   // pending_infobar_requests_ will not have received any new entries between
   // the NotificationService's call to InfoBarContainer::Observe and this
   // method.
   InfoBarDelegate* delegate =
       content::Details<InfoBarRemovedDetails>(details)->first;
   for (PendingInfoBarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ++i) {
-    GeolocationConfirmInfoBarDelegate* confirm_delegate = i->infobar_delegate();
+    InfoBarDelegate* confirm_delegate = i->infobar_delegate();
     if (confirm_delegate == delegate) {
       GeolocationPermissionRequestID id(i->id());
       pending_infobar_requests_.erase(i);
       ShowQueuedInfoBarForTab(id);
       return;
     }
   }
 }
 
 bool GeolocationInfoBarQueueController::AlreadyShowingInfoBarForTab(
@@ skipping 22 matching lines @@
     ClearPendingInfoBarRequestsForTab(id);
     return;
   }
 
   for (PendingInfoBarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ++i) {
     if (i->id().IsForSameTabAs(id) && !i->has_infobar_delegate()) {
       RegisterForInfoBarNotifications(infobar_service);
       i->CreateInfoBarDelegate(
           this, profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
-      infobar_service->AddInfoBar(i->infobar_delegate());
       return;
     }
   }
 
   UnregisterForInfoBarNotifications(infobar_service);
 }
 
 void GeolocationInfoBarQueueController::ClearPendingInfoBarRequestsForTab(
     const GeolocationPermissionRequestID& id) {
   for (PendingInfoBarRequests::iterator i = pending_infobar_requests_.begin();
@@ skipping 19 matching lines @@
 void GeolocationInfoBarQueueController::UnregisterForInfoBarNotifications(
     InfoBarService* infobar_service) {
   if (registrar_.IsRegistered(
       this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::Source<InfoBarService>(infobar_service))) {
     registrar_.Remove(this,
                       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                       content::Source<InfoBarService>(infobar_service));
   }
 }