Revert of Don't use the DSE geolocation setting when chrome doesn't have location.

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/location_settings_impl.h"
 #include "chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.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"
@@ skipping 107 matching lines @@
 
 void SearchGeolocationService::Factory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(prefs::kGoogleDSEGeolocationSetting);
 }
 
 SearchGeolocationService::SearchGeolocationService(Profile* profile)
     : profile_(profile),
       pref_service_(profile_->GetPrefs()),
       host_content_settings_map_(
-          HostContentSettingsMapFactory::GetForProfile(profile_)),
-      location_settings_(new LocationSettingsImpl()) {
+          HostContentSettingsMapFactory::GetForProfile(profile_)) {
   // This class should never be constructed in incognito.
   DCHECK(!profile_->IsOffTheRecord());
 
   if (!UseConsistentSearchGeolocation())
     return;
 
   delegate_.reset(new SearchEngineDelegateImpl(profile_));
   delegate_->SetDSEChangedCallback(base::Bind(
       &SearchGeolocationService::OnDSEChanged, base::Unretained(this)));
 
@@ skipping 16 matching lines @@
   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) {
     return false;
   }
 
-  if (!location_settings_->HasAndroidLocationPermission())
-    return false;
-
   return true;
 }
 
 bool SearchGeolocationService::GetDSEGeolocationSetting() {
   // Make sure the setting is valid, in case enterprise policy has changed.
   // TODO(benwells): Check if enterprise policy can change while Chrome is
   // running. If it can't this call is probably not needed.
   EnsureDSEGeolocationSettingIsValid();
 
   return GetDSEGeolocationPref().setting;
@@ skipping 128 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)));
 }
-
-void SearchGeolocationService::SetLocationSettingsForTest(
-    std::unique_ptr<LocationSettings> settings) {
-  location_settings_ = std::move(settings);
-}