Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/geolocation/geolocation_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_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 49 matching lines @@
 }
 
 }  // namespace
 
 // static
 InfoBar* GeolocationInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
-    const std::string& display_languages) {
+    const std::string& display_languages,
+    const std::string accept_button_label) {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_CREATE);
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
-  return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new DelegateType(
+  GeolocationInfoBarDelegate* const delegate = new DelegateType(

[bulach, 2014/02/14 11:36:48]

nit: is it possible to keep everything inline?

return infobar_service->AddInfoBar(
    ConfirmInfoBarDelegate::CreateInfoBar(
        scoped_ptr<ConfirmInfoBarDelegate>(
            new DelegateType(....)));

the .release in 81 just to put in another scoped_ptr in 82 looks a bit
complicated..

[acleung1, 2014/02/21 21:18:01]

My thoughts were that it was a bit too long as one line. I think I'll keep it as
its.

           controller, id, requesting_frame,
           committed_entry ? committed_entry->GetUniqueID() : 0,
-          display_languages))));
+          display_languages, accept_button_label);
+
+  InfoBar* infobar = ConfirmInfoBarDelegate::CreateInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate>(delegate)).release();
+  return infobar_service->AddInfoBar(scoped_ptr<InfoBar>(infobar));
 }
 
 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate(
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages)
     : ConfirmInfoBarDelegate(),
       controller_(controller),
@@ skipping 83 matching lines @@
       "https://www.google.com/support/chrome/bin/answer.py?answer=142065";
 #endif
 
   web_contents()->OpenURL(content::OpenURLParams(
       google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;  // Do not dismiss the info bar.
 }