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

chrome/browser/geolocation/geolocation_confirm_infobar_delegate.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_confirm_infobar_delegate.h"
 
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
 #include "chrome/browser/google/google_util.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate_android.h"
+typedef GeolocationConfirmInfoBarDelegateAndroid DelegateType;
+#else
+typedef GeolocationConfirmInfoBarDelegate DelegateType;
+#endif
+
+
+// static
+InfoBarDelegate* GeolocationConfirmInfoBarDelegate::Create(
+    InfoBarService* infobar_service,
+    GeolocationInfoBarQueueController* controller,
+    const GeolocationPermissionRequestID& id,
+    const GURL& requesting_frame,
+    const std::string& display_languages) {
+  return infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new DelegateType(infobar_service, controller, id, requesting_frame,
+                       display_languages)));
+}
 
 GeolocationConfirmInfoBarDelegate::GeolocationConfirmInfoBarDelegate(
     InfoBarService* infobar_service,
     GeolocationInfoBarQueueController* controller,
     const GeolocationPermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages)
     : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller),
       id_(id),
@@ skipping 67 matching lines @@
 #endif
 
   content::OpenURLParams params(
       google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   owner()->GetWebContents()->OpenURL(params);
   return false;  // Do not dismiss the info bar.
 }