Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER.

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/tab_specific_content_settings.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.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"
 #include "components/content_settings/core/browser/content_settings_provider.h"

[msramek, 2015/04/07 12:01:40]

Remove this inclusion?

[Deepak, 2015/04/07 13:08:14]

On 2015/04/07 12:01:40, msramek wrote:

Done.

 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/media_stream_request.h"
 #include "extensions/common/constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 505 matching lines @@
       return false;
 
     if (policy == POLICY_NOT_SET) {
       // Only load content settings from secure origins unless it is a
       // content::MEDIA_OPEN_DEVICE (Pepper) request.
       if (!IsSchemeSecure() &&
           request_.request_type != content::MEDIA_OPEN_DEVICE) {
         return false;
       }
       if (profile_->GetHostContentSettingsMap()->GetContentSetting(
-              request_.security_origin, request_.security_origin,
-              device_checks[i].settings_type, NO_RESOURCE_IDENTIFIER) !=
-              CONTENT_SETTING_ALLOW) {
+              request_.security_origin,
+              request_.security_origin,
+              device_checks[i].settings_type,
+              content_settings::ResourceIdentifier()) !=
+          CONTENT_SETTING_ALLOW) {
         return false;
       }
     }
     // If we get here, then either policy is set to ALWAYS_ALLOW or the content
     // settings allow the request by default.
   }
 
   return true;
 }
 
 int MediaStreamDevicesController::FilterBlockedByDefaultDevices() {
   int requested_devices = 0;
 
   if (IsDeviceAudioCaptureRequestedAndAllowed()) {
     if (profile_->GetHostContentSettingsMap()->GetContentSetting(
-        request_.security_origin,
-        request_.security_origin,
-        CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
-        NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_BLOCK) {
+            request_.security_origin,
+            request_.security_origin,
+            CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+            content_settings::ResourceIdentifier()) ==
+        CONTENT_SETTING_BLOCK) {
       request_permissions_[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
           MEDIA_BLOCKED_BY_USER_SETTING;
     } else {
       ++requested_devices;
     }
   }
 
   if (IsDeviceVideoCaptureRequestedAndAllowed()) {
     if (profile_->GetHostContentSettingsMap()->GetContentSetting(
-        request_.security_origin,
-        request_.security_origin,
-        CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
-        NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_BLOCK) {
+            request_.security_origin,
+            request_.security_origin,
+            CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+            content_settings::ResourceIdentifier()) ==
+        CONTENT_SETTING_BLOCK) {
       request_permissions_[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
           MEDIA_BLOCKED_BY_USER_SETTING;
     } else {
       ++requested_devices;
     }
   }
 
   return requested_devices;
 }
 
@@ skipping 89 matching lines @@
 }
 
 bool MediaStreamDevicesController::IsCaptureDeviceRequestAllowed() const {
 #if defined(OS_ANDROID)
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }