Change PermissionContextBase to always return CONTENT_SETTING_ASK if a user dismisses the prompt

chrome/browser/permissions/permission_context_base.cc

 // Copyright 2014 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/permissions/permission_context_base.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 255 matching lines @@
     bool persist,
     ContentSetting content_setting) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (persist)
     UpdateContentSetting(requesting_origin, embedding_origin, content_setting);
 
   UpdateTabContext(id, requesting_origin,
                    content_setting == CONTENT_SETTING_ALLOW);
 
-  if (content_setting == CONTENT_SETTING_DEFAULT) {
-    content_setting =
-        HostContentSettingsMapFactory::GetForProfile(profile_)
-            ->GetDefaultContentSetting(content_settings_type_, nullptr);
-  }
+  if (content_setting == CONTENT_SETTING_DEFAULT)
+    content_setting = CONTENT_SETTING_ASK;
 
-  DCHECK_NE(content_setting, CONTENT_SETTING_DEFAULT);
   callback.Run(content_setting);
 }
 
 void PermissionContextBase::CleanUpRequest(const PermissionRequestID& id) {
   size_t success = pending_requests_.erase(id.ToString());
   DCHECK(success == 1) << "Missing request " << id.ToString();
 }
 
 void PermissionContextBase::UpdateContentSetting(
     const GURL& requesting_origin,
@@ skipping 10 matching lines @@
                                       content_setting);
 }
 
 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
   const std::string param = variations::GetVariationParamValue(
       kPermissionsKillSwitchFieldStudy,
       PermissionUtil::GetPermissionString(permission_type_));
 
   return param == kPermissionsKillSwitchBlockedValue;
 }