Don't enable the DSE geolocation setting until EULA accepted

chrome/browser/android/search_geolocation/search_geolocation_service.cc

 // Copyright 2017 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_service.h"
 
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/values.h"
 #include "chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_service_observer.h"
+#include "components/web_resource/web_resource_pref_names.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace {
 
 const char kIsGoogleSearchEngineKey[] = "is_google_search_engine";
 const char kDSESettingKey[] = "dse_setting";
 
 // Default implementation of SearchEngineDelegate that is used for production
 // code.
@@ skipping 115 matching lines @@
   // become invalid either by changes being made to enterprise policy, or while
   // the flag to enable consistent search geolocation was off.
   EnsureDSEGeolocationSettingIsValid();
 }
 
 bool SearchGeolocationService::UseDSEGeolocationSetting(
     const url::Origin& requesting_origin) {
   if (!UseConsistentSearchGeolocation())
     return false;
 
+  // Don't use the DSE setting until the EULA has been acceptd. This prevents
+  // the disclosure being shown on the privacy policy before accepting the UELA,
+  // and would also stop the privacy policy ever getting geolocation access by
+  // default.
+  if (g_browser_process && g_browser_process->local_state() &&
+      !g_browser_process->local_state()->GetBoolean(prefs::kEulaAccepted)) {
+    return false;
+  }
+
   if (requesting_origin.scheme() != url::kHttpsScheme)
     return false;
 
   if (!requesting_origin.IsSameOriginWith(delegate_->GetGoogleDSECCTLD()))
     return false;
 
   // If the content setting for the DSE CCTLD is controlled by policy, and is st
   // to ASK, don't use the DSE geolocation setting.
   if (!IsContentSettingUserSettable() &&
       GetCurrentContentSetting() == CONTENT_SETTING_ASK) {
@@ skipping 141 matching lines @@
 bool SearchGeolocationService::UseConsistentSearchGeolocation() {
   return base::FeatureList::IsEnabled(features::kConsistentOmniboxGeolocation);
 }
 
 void SearchGeolocationService::SetSearchEngineDelegateForTest(
     std::unique_ptr<SearchEngineDelegate> delegate) {
   delegate_ = std::move(delegate);
   delegate_->SetDSEChangedCallback(base::Bind(
       &SearchGeolocationService::OnDSEChanged, base::Unretained(this)));
 }