Make geolocation API and X-Geo header access consistent

chrome/browser/geolocation/geolocation_permission_context.cc

Index: chrome/browser/geolocation/geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc
index 4e282fcb21301b9a880e59d521cb15498b29b8f4..38ab762bb4310d2391873e420a50fd1f735e9577 100644
--- a/chrome/browser/geolocation/geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context.cc
@@ -13,10 +13,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "device/geolocation/geolocation_provider.h"
-
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/search_geolocation/search_geolocation_disclosure_infobar_delegate.h"
-#endif
+#include "url/origin.h"
 
 GeolocationPermissionContext::GeolocationPermissionContext(Profile* profile)
     : PermissionContextBase(profile,
@@ -54,17 +51,6 @@ void GeolocationPermissionContext::DecidePermission(
     return;
   }
 
-#if defined(OS_ANDROID)
-  // If the search geolocation disclosure is open, don't pop up a permission
-  // request. Treat this as a dismissal instead.
-  if (SearchGeolocationDisclosureInfoBarDelegate::
-          IsSearchGeolocationDisclosureOpen(web_contents)) {
-    NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        false /* persist */, CONTENT_SETTING_DEFAULT);
-    return;
-  }
-#endif
-
   PermissionContextBase::DecidePermission(web_contents,
                                           id,
                                           requesting_origin,