Change HostContentSettingsMap::SetContentSetting to use GURLs instead of patterns

chrome/browser/media/media_stream_devices_controller.cc

 // Copyright (c) 2012 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/media/media_stream_devices_controller.h"
 
 #include <map>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 440 matching lines @@
              ->GetMediaStreamCaptureIndicator()
              ->RegisterMediaStream(web_contents_, devices);
   }
   base::ResetAndReturn(&callback_).Run(devices, request_result, std::move(ui));
 }
 
 void MediaStreamDevicesController::StorePermission(
     ContentSetting new_audio_setting,
     ContentSetting new_video_setting) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  ContentSettingsPattern primary_pattern =
-      ContentSettingsPattern::FromURLNoWildcard(request_.security_origin);
 
   bool is_pepper_request =
       request_.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY;
 
   if (IsAskingForAudio() && new_audio_setting != CONTENT_SETTING_ASK) {
     if (ShouldPersistContentSetting(new_audio_setting, request_.security_origin,
                                     is_pepper_request)) {
-      HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
-          primary_pattern, ContentSettingsPattern::Wildcard(),
-          CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(),
-          new_audio_setting);
+      HostContentSettingsMapFactory::GetForProfile(profile_)
+          ->SetContentSettingDefaultScope(request_.security_origin, GURL(),
+                                          CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+                                          std::string(), new_audio_setting);
     }
   }
   if (IsAskingForVideo() && new_video_setting != CONTENT_SETTING_ASK) {
     if (ShouldPersistContentSetting(new_video_setting, request_.security_origin,
                                     is_pepper_request)) {
-      HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
-          primary_pattern, ContentSettingsPattern::Wildcard(),
-          CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(),
-          new_video_setting);
+      HostContentSettingsMapFactory::GetForProfile(profile_)
+          ->SetContentSettingDefaultScope(
+              request_.security_origin, GURL(),
+              CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(),
+              new_video_setting);
     }
   }
 }
 
 void MediaStreamDevicesController::UpdateTabSpecificContentSettings(
     ContentSetting audio_setting,
     ContentSetting video_setting) const {
   if (!content_settings_)
     return;
 
@@ skipping 118 matching lines @@
   if (android_permission_blocked)
     return false;
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   // TODO(raymes): Shouldn't this apply to all permissions not just audio/video?
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }