Make geolocation API and X-Geo header access consistent

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 66 matching lines @@
 
 void SearchGeolocationDisclosureTabHelper::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   if (consistent_geolocation_enabled_) {
     MaybeShowDefaultSearchGeolocationDisclosure(
         web_contents()->GetVisibleURL());
   }
 }
 
 // static
+void SearchGeolocationDisclosureTabHelper::ResetDisclosure(Profile* profile) {
+  PrefService* prefs = profile->GetPrefs();
+  prefs->ClearPref(prefs::kSearchGeolocationDisclosureShownCount);
+  prefs->ClearPref(prefs::kSearchGeolocationDisclosureLastShowDate);
+  prefs->ClearPref(prefs::kSearchGeolocationDisclosureDismissed);
+}
+
+// static
 void SearchGeolocationDisclosureTabHelper::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kSearchGeolocationDisclosureDismissed,
                                 false);
   registry->RegisterIntegerPref(prefs::kSearchGeolocationDisclosureShownCount,
                                 0);
   registry->RegisterInt64Pref(prefs::kSearchGeolocationDisclosureLastShowDate,
                               0);
   registry->RegisterBooleanPref(
       prefs::kSearchGeolocationPreDisclosureMetricsRecorded, false);
@@ skipping 139 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;
 }