Improve performance of search geolocation disclosure check.

chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.cc

 // Copyright 2016 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/android/search_geolocation/search_geolocation_disclosure_tab_helper.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
@@ skipping 69 matching lines @@
     const content::LoadCommittedDetails& load_details) {
   if (consistent_geolocation_enabled_)
     MaybeShowDisclosure(web_contents()->GetVisibleURL());
 }
 
 void SearchGeolocationDisclosureTabHelper::MaybeShowDisclosure(
     const GURL& gurl) {
   if (!ShouldShowDisclosureForUrl(gurl))
     return;
 
-  // Check that the Chrome app has geolocation permission.
-  JNIEnv* env = base::android::AttachCurrentThread();
-  if (!Java_GeolocationHeader_hasGeolocationPermission(env))
-    return;
-
   // Don't show the infobar if the user has dismissed it, or they've seen it
   // enough times already.
   PrefService* prefs = GetProfile()->GetPrefs();
   bool dismissed_already =
       prefs->GetBoolean(prefs::kSearchGeolocationDisclosureDismissed);
   int shown_count =
       prefs->GetInteger(prefs::kSearchGeolocationDisclosureShownCount);
   if (dismissed_already || shown_count >= GetMaxShowCount()) {
     // Record metrics for the state of permissions after the disclosure has been
     // shown. This is not done immediately after showing the last disclosure
     // (i.e. at the end of this function), but on the next omnibox search, to
     // allow the metric to capture changes to settings done by the user as a
     // result of clicking on the Settings link in the disclosure.
     RecordPostDisclosureMetrics(gurl);
     return;
   }
 
   // Or if it has been shown too recently.
   base::Time last_shown = base::Time::FromInternalValue(
       prefs->GetInt64(prefs::kSearchGeolocationDisclosureLastShowDate));
   if (GetTimeNow() - last_shown < base::TimeDelta::FromDays(GetDaysPerShow())) {
     return;
   }
 
+  // Check that the Chrome app has geolocation permission.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (!Java_GeolocationHeader_hasGeolocationPermission(env))
+    return;

[raymes, 2017/02/01 18:04:41]

As discussed in person, we may want to move this right to the bottom to avoid
calling it in as many cases as possible :)

+
   // Record metrics for the state of permissions before the disclosure has been
   // shown.
   RecordPreDisclosureMetrics(gurl);
 
   // Only show the disclosure if the geolocation permission is set ask (i.e. has
   // not been explicitly set or revoked).
   ContentSetting status =
       HostContentSettingsMapFactory::GetForProfile(GetProfile())
           ->GetContentSetting(gurl, gurl, CONTENT_SETTINGS_TYPE_GEOLOCATION,
                               std::string());
@@ skipping 106 matching lines @@
     const base::android::JavaParamRef<jclass>& clazz) {
   gIgnoreUrlChecksForTesting = true;
 }
 
 // static
 void SetDayOffsetForTesting(JNIEnv* env,
                             const base::android::JavaParamRef<jclass>& clazz,
                             jint days) {
   gDayOffsetForTesting = days;
 }