Add switch to disable showing the search geolocation disclosure UI.

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/command_line.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/search_geolocation/search_geolocation_disclosure_infobar_delegate.h"
 #include "chrome/browser/android/search_geolocation/search_geolocation_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/GeolocationHeader_jni.h"
 #include "jni/SearchGeolocationDisclosureTabHelper_jni.h"
@@ skipping 34 matching lines @@
   return base::Time::Now() + base::TimeDelta::FromDays(gDayOffsetForTesting);
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchGeolocationDisclosureTabHelper);
 
 SearchGeolocationDisclosureTabHelper::SearchGeolocationDisclosureTabHelper(
     content::WebContents* contents)
     : content::WebContentsObserver(contents) {
-  consistent_geolocation_enabled_ =
-      base::FeatureList::IsEnabled(features::kConsistentOmniboxGeolocation);
+  consistent_geolocation_disclosure_enabled_ =
+      base::FeatureList::IsEnabled(features::kConsistentOmniboxGeolocation) &&
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableSearchGeolocationDisclosure);
 }
 
 SearchGeolocationDisclosureTabHelper::~SearchGeolocationDisclosureTabHelper() {}
 
 void SearchGeolocationDisclosureTabHelper::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   MaybeShowDisclosure(web_contents()->GetVisibleURL());
 }
 
 void SearchGeolocationDisclosureTabHelper::MaybeShowDisclosure(
     const GURL& gurl) {
-  if (!consistent_geolocation_enabled_)
+  if (!consistent_geolocation_disclosure_enabled_)
     return;
 
   if (!ShouldShowDisclosureForUrl(gurl))
     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);
@@ skipping 140 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;
 }