chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc - Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/

Unified Diff: chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixup 2 Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/prerender/prerender_events.cc ('K') | « chrome/browser/profile_resetter/resettable_settings_snapshot.cc ('k') | chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc » ('j') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

index c80e9293ab033392611a7d6db845d7e8c414ada4..c785071cc6e3b21f566ef17497110ef4a97f1ca1 100644

--- a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

+++ b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

@@ -30,40 +30,40 @@ namespace chrome {

namespace {

#if defined(OS_CHROMEOS)

-COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE) ==

+static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NONE),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE);

-COMPILE_ASSERT(

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE value mismatch");

+static_assert(

static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_UNKNOWN),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN);

-COMPILE_ASSERT(

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN value mismatch");

+static_assert(

static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_INTERNAL),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL);

-COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA) ==

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL value mismatch");

+static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_VGA),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA);

-COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI) ==

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA value mismatch");

+static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_HDMI),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI);

-COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI) ==

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI value mismatch");

+static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DVI),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI);

-COMPILE_ASSERT(

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI value mismatch");

+static_assert(

static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DISPLAYPORT),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT);

-COMPILE_ASSERT(

+ "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT value mismatch");

+static_assert(

static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK) ==

static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NETWORK),

- PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK);

-COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE) ==

+ "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);

-COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP) ==

+ "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);

+ "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP value mismatch");

bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64* display_id) {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));