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

chrome/browser/media/media_capture_devices_dispatcher.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_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/screen_capture_notification_ui.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/browser/media_capture_devices.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 374 matching lines @@
       ALWAYS_ALLOW) {
     return true;
   }
 
   // There's no secondary URL for these content types, hence duplicating
   // |security_origin|.
   if (profile->GetHostContentSettingsMap()->GetContentSetting(
           security_origin,
           security_origin,
           contentSettingsType,
-          NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
+          content_settings::ResourceIdentifier()) ==
+      CONTENT_SETTING_ALLOW) {

[perkj_chrome, 2015/04/08 10:51:15]

is it clang format that does this? git cl format? It looks wrong to me to not
have this indentet.

     return true;
   }
 
   return false;
 }
 
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type) {
@@ skipping 25 matching lines @@
       ALWAYS_ALLOW) {
     return true;
   }
 
   // There's no secondary URL for these content types, hence duplicating
   // |security_origin|.
   if (profile->GetHostContentSettingsMap()->GetContentSetting(
           security_origin,
           security_origin,
           contentSettingsType,
-          NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
+          content_settings::ResourceIdentifier()) ==
+      CONTENT_SETTING_ALLOW) {
     return true;
   }
 
   return false;
 }
 
 #if defined(ENABLE_EXTENSIONS)
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
@@ skipping 661 matching lines @@
 
 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(
     const MediaStreamDevices& devices) {
   test_audio_devices_ = devices;
 }
 
 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(
     const MediaStreamDevices& devices) {
   test_video_devices_ = devices;
 }