[InfoBar] remove unnecesary checks from some delegates.

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_service.h"
@@ skipping 88 matching lines @@
 
 bool GeolocationInfoBarDelegate::Accept() {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_ALLOW);
   set_user_has_interacted();
   SetPermission(true, true);
   return true;
 }
 
 void GeolocationInfoBarDelegate::SetPermission(bool update_content_setting,
                                                bool allowed) {
-  if (web_contents()) {
-    GURL embedder = web_contents()->GetLastCommittedURL().GetOrigin();
-    controller_->OnPermissionSet(id_, requesting_frame_, embedder,
-                                 update_content_setting, allowed);
-  }
+  controller_->OnPermissionSet(id_, requesting_frame_,
+      web_contents()->GetURL(), update_content_setting, allowed);

[Peter Kasting, 2013/11/04 22:14:19]

Nit: All lines of args should begin at the same indent

Does GetURL() do the same thing as GetLastCommittedURL()?  I'd have thought
these would differ when there's a pending navigation.

You also removed the GetOrigin() call, is this already handled by some other
code later in the call chain?

[Michael van Ouwerkerk, 2013/11/05 11:49:06]

Peter is right, these changes are incorrect. Please see
https://chromiumcodereview.appspot.com/23440030/

To summarize:
* This probably reintroduces bug 286667
* GetURL is deprecated

On 2013/11/04 22:14:19, Peter Kasting wrote:

[Miguel Garcia, 2013/11/05 14:17:56]

Thanks for the pointer, I removed the straight git revert and replaced it with
manually removing the if instead.

On 2013/11/05 11:49:06, Michael van Ouwerkerk wrote:

 }
 
 void GeolocationInfoBarDelegate::InfoBarDismissed() {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_DISMISS);
   set_user_has_interacted();
   SetPermission(false, false);
 }
 
 int GeolocationInfoBarDelegate::GetIconID() const {
   return IDR_GEOLOCATION_INFOBAR_ICON;
@@ skipping 48 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.
 }