Commit 8b2e68dc authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

Refactor OS_LINUX preprocessor directive for LaCrOS effort.

Currently, ChromeOS defines the OS_LINUX directive as well as
OS_CHROMEOS.  We're working to separate these two, so we're
making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS
explicit.

This is changes for /google_apis/gcm

This CL was uploaded by git cl split.

R=dimich@chromium.org

Bug: 1110266
Change-Id: I2403e075be078395a691fdf6ea1f04e33dc76fa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2370299Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Sean McAllister <smcallis@google.com>
Cr-Commit-Position: refs/heads/master@{#803144}
parent e6713881
......@@ -450,7 +450,7 @@ TEST_F(GCMConnectionHandlerImplTest, ReInit) {
// Verify that messages can be received after initialization.
// Flaky on Linux (crbug.com/906093)
#if defined(OS_LINUX)
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_RecvMsg DISABLED_RecvMsg
#else
#define MAYBE_RecvMsg RecvMsg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment