[chrome/browser/renderer_host] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

 // Copyright 2013 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/renderer_host/pepper/pepper_output_protection_message_filter.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 48 matching lines @@
         static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NETWORK),
     "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK value mismatch");
 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE) ==
                    static_cast<int>(ui::CONTENT_PROTECTION_METHOD_NONE),
                "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE value mismatch");
 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP) ==
                    static_cast<int>(ui::CONTENT_PROTECTION_METHOD_HDCP),
                "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP value mismatch");
 
 bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64* display_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   gfx::NativeView native_view = rfh->GetNativeView();
   gfx::Screen* screen = gfx::Screen::GetScreenFor(native_view);
   if (!screen)
     return false;
   gfx::Display display = screen->GetDisplayNearestWindow(native_view);
   *display_id = display.id();
   return true;
 }
 
 void DoNothing(bool status) {
@@ skipping 57 matching lines @@
 };
 
 PepperOutputProtectionMessageFilter::Delegate::Delegate(int render_process_id,
                                                         int render_frame_id)
     : render_process_id_(render_process_id),
       render_frame_id_(render_frame_id),
       window_(NULL),
       client_id_(ui::DisplayConfigurator::kInvalidClientId),
       display_id_(0),
       weak_ptr_factory_(this) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 }
 
 PepperOutputProtectionMessageFilter::Delegate::~Delegate() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   ui::DisplayConfigurator* configurator =
       ash::Shell::GetInstance()->display_configurator();
   configurator->UnregisterContentProtectionClient(client_id_);
 
   if (window_)
     window_->RemoveObserver(this);
 }
 
 ui::DisplayConfigurator::ContentProtectionClientId
 PepperOutputProtectionMessageFilter::Delegate::GetClientId() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (client_id_ == ui::DisplayConfigurator::kInvalidClientId) {
     content::RenderFrameHost* rfh =
         content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
     if (!GetCurrentDisplayId(rfh, &display_id_))
       return ui::DisplayConfigurator::kInvalidClientId;
 
     window_ = rfh->GetNativeView();
     if (!window_)
       return ui::DisplayConfigurator::kInvalidClientId;
 
     ui::DisplayConfigurator* configurator =
         ash::Shell::GetInstance()->display_configurator();
     client_id_ = configurator->RegisterContentProtectionClient();
 
     if (client_id_ != ui::DisplayConfigurator::kInvalidClientId)
       window_->AddObserver(this);
   }
   return client_id_;
 }
 
 void PepperOutputProtectionMessageFilter::Delegate::QueryStatus(
     const QueryStatusCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
   if (!rfh) {
     LOG(WARNING) << "RenderFrameHost is not alive.";
     callback.Run(PP_ERROR_FAILED, 0, 0);
     return;
   }
 
   ui::DisplayConfigurator* configurator =
       ash::Shell::GetInstance()->display_configurator();
   configurator->QueryContentProtectionStatus(
       GetClientId(), display_id_,
       base::Bind(
           &PepperOutputProtectionMessageFilter::Delegate::QueryStatusComplete,
           weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void PepperOutputProtectionMessageFilter::Delegate::EnableProtection(
     uint32_t desired_method_mask,
     const EnableProtectionCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   ui::DisplayConfigurator* configurator =
       ash::Shell::GetInstance()->display_configurator();
   configurator->EnableContentProtection(
       GetClientId(), display_id_, desired_method_mask,
       base::Bind(&PepperOutputProtectionMessageFilter::Delegate::
                      EnableProtectionComplete,
                  weak_ptr_factory_.GetWeakPtr(), callback));
   desired_method_mask_ = desired_method_mask;
 }
@@ skipping 68 matching lines @@
   window_->RemoveObserver(this);
   window_ = NULL;
 }
 #endif  // defined(OS_CHROMEOS)
 
 PepperOutputProtectionMessageFilter::PepperOutputProtectionMessageFilter(
     content::BrowserPpapiHost* host,
     PP_Instance instance)
     : weak_ptr_factory_(this) {
 #if defined(OS_CHROMEOS)
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   int render_process_id = 0;
   int render_frame_id = 0;
   host->GetRenderFrameIDsForInstance(
       instance, &render_process_id, &render_frame_id);
   delegate_ = new Delegate(render_process_id, render_frame_id);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
@@ skipping 69 matching lines @@
 
 void PepperOutputProtectionMessageFilter::OnEnableProtectionComplete(
     ppapi::host::ReplyMessageContext reply_context,
     int32_t result) {
   reply_context.params.set_result(result);
   SendReply(reply_context,
             PpapiPluginMsg_OutputProtection_EnableProtectionReply());
 }
 
 }  // namespace chrome