| Index: content/test/plugin/plugin_get_javascript_url_test.cc
|
| diff --git a/content/test/plugin/plugin_get_javascript_url_test.cc b/content/test/plugin/plugin_get_javascript_url_test.cc
|
| index b2ac515f75a099b55e745a41b0f7bb342c7d20e1..13ccdcd155536fd857f9a15228ee0406d4e248d2 100644
|
| --- a/content/test/plugin/plugin_get_javascript_url_test.cc
|
| +++ b/content/test/plugin/plugin_get_javascript_url_test.cc
|
| @@ -109,8 +109,8 @@ NPError ExecuteGetJavascriptUrlTest::NewStream(NPMIMEType type,
|
| return NPERR_NO_ERROR;
|
| }
|
|
|
| - COMPILE_ASSERT(sizeof(unsigned long) <= sizeof(stream->notifyData),
|
| - cast_validity_check);
|
| + static_assert(sizeof(unsigned long) <= sizeof(stream->notifyData),
|
| + "cast validity check");
|
| unsigned long stream_id = reinterpret_cast<unsigned long>(stream->notifyData);
|
| switch (stream_id) {
|
| case SELF_URL_STREAM_ID:
|
| @@ -146,8 +146,8 @@ int32 ExecuteGetJavascriptUrlTest::Write(NPStream *stream, int32 offset,
|
| return len;
|
| }
|
|
|
| - COMPILE_ASSERT(sizeof(unsigned long) <= sizeof(stream->notifyData),
|
| - cast_validity_check);
|
| + static_assert(sizeof(unsigned long) <= sizeof(stream->notifyData),
|
| + "cast validity check");
|
| unsigned long stream_id = reinterpret_cast<unsigned long>(stream->notifyData);
|
| switch (stream_id) {
|
| case SELF_URL_STREAM_ID:
|
| @@ -178,8 +178,8 @@ NPError ExecuteGetJavascriptUrlTest::DestroyStream(NPStream *stream,
|
| return NPERR_NO_ERROR;
|
| }
|
|
|
| - COMPILE_ASSERT(sizeof(unsigned long) <= sizeof(stream->notifyData),
|
| - cast_validity_check);
|
| + static_assert(sizeof(unsigned long) <= sizeof(stream->notifyData),
|
| + "cast validity check");
|
| unsigned long stream_id = reinterpret_cast<unsigned long>(stream->notifyData);
|
| switch (stream_id) {
|
| case SELF_URL_STREAM_ID:
|
| @@ -194,8 +194,8 @@ NPError ExecuteGetJavascriptUrlTest::DestroyStream(NPStream *stream,
|
|
|
| void ExecuteGetJavascriptUrlTest::URLNotify(const char* url, NPReason reason,
|
| void* data) {
|
| - COMPILE_ASSERT(sizeof(unsigned long) <= sizeof(data),
|
| - cast_validity_check);
|
| + static_assert(sizeof(unsigned long) <= sizeof(data),
|
| + "cast validity check");
|
|
|
| if (npn_evaluate_context_) {
|
| SetError("URLNotify received in context of NPN_Evaluate");
|
|
|