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
@@ skipping 23 matching lines @@
                               std::string());
   if (status != CONTENT_SETTING_ASK)
     return;
 
   // And only show disclosure if the DSE geolocation setting is on.
   SearchGeolocationService* service =
       SearchGeolocationService::Factory::GetForBrowserContext(GetProfile());
   if (!service->GetDSEGeolocationSetting())
     return;
 
+  // Check that the Chrome app has geolocation permission.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (!Java_GeolocationHeader_hasGeolocationPermission(env))
+    return;
+
   // All good, let's show the disclosure and increment the shown count.
   SearchGeolocationDisclosureInfoBarDelegate::Create(web_contents(), gurl);
   shown_count++;
   prefs->SetInteger(prefs::kSearchGeolocationDisclosureShownCount, shown_count);
   prefs->SetInt64(prefs::kSearchGeolocationDisclosureLastShowDate,
                   GetTimeNow().ToInternalValue());
 }
 
 // static
 void SearchGeolocationDisclosureTabHelper::ResetDisclosure(Profile* profile) {
@@ skipping 87 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;
 }