Reset geolocation permission embargo for an origin when it becomes DSE

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/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/permissions/permission_decision_auto_blocker.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"
@@ skipping 192 matching lines @@
   delegate_.reset();
 }
 
 SearchGeolocationService::~SearchGeolocationService() {}
 
 void SearchGeolocationService::OnDSEChanged() {
   base::string16 new_dse_name = delegate_->GetDSEName();
   PrefValue pref = GetDSEGeolocationPref();
   ContentSetting content_setting = GetCurrentContentSetting();
 
+  // Remove any geolocation embargo on the URL.
+  PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveEmbargoByUrl(
+      delegate_->GetDSEOrigin().GetURL(), CONTENT_SETTINGS_TYPE_GEOLOCATION);
   if (content_setting == CONTENT_SETTING_BLOCK && pref.setting) {
     pref.setting = false;
   } else if (content_setting == CONTENT_SETTING_ALLOW && !pref.setting) {
     ResetContentSetting();
   }
 
   if (new_dse_name != pref.dse_name && pref.setting)
     SearchGeolocationDisclosureTabHelper::ResetDisclosure(profile_);
 
   pref.dse_name = new_dse_name;
@@ skipping 110 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)));
 }