Removed Profile::GetHostContentSettingsMap

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 "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_permission.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/media/media_stream_device_permissions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 259 matching lines @@
       break;
     }
     case content::MEDIA_ENUMERATE_DEVICES: {
       // Do nothing.
       NOTREACHED();
       break;
     }
   }  // switch
 
   if (audio_allowed) {
-    profile_->GetHostContentSettingsMap()->UpdateLastUsageByPattern(
-        ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
-        ContentSettingsPattern::Wildcard(),
-        CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+    HostContentSettingsMapFactory::GetForProfile(profile_)
+        ->UpdateLastUsageByPattern(
+            ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
+            ContentSettingsPattern::Wildcard(),
+            CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
   }
   if (video_allowed) {
-    profile_->GetHostContentSettingsMap()->UpdateLastUsageByPattern(
-        ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
-        ContentSettingsPattern::Wildcard(),
-        CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+    HostContentSettingsMapFactory::GetForProfile(profile_)
+        ->UpdateLastUsageByPattern(
+            ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
+            ContentSettingsPattern::Wildcard(),
+            CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   }
 
   return devices;
 }
 
 void MediaStreamDevicesController::RunCallback(
     ContentSetting audio_setting,
     ContentSetting video_setting,
     content::MediaStreamRequestResult denial_reason) {
   StorePermission(audio_setting, video_setting);
@@ skipping 31 matching lines @@
     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;
 
   if (IsAskingForAudio() && new_audio_setting != CONTENT_SETTING_ASK) {
     if (ShouldPersistContentSetting(new_audio_setting, request_.security_origin,
                                     is_pepper_request)) {
-      profile_->GetHostContentSettingsMap()->SetContentSetting(
+      HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
           primary_pattern, ContentSettingsPattern::Wildcard(),
           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)) {
-      profile_->GetHostContentSettingsMap()->SetContentSetting(
+      HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
           primary_pattern, ContentSettingsPattern::Wildcard(),
           CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(),
           new_video_setting);
     }
   }
 }
 
 void MediaStreamDevicesController::UpdateTabSpecificContentSettings(
     ContentSetting audio_setting,
     ContentSetting video_setting) const {
@@ skipping 110 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;
 }