Commit 07704e5b authored by Will Harris's avatar Will Harris Committed by Commit Bot

Change preprocessor directive to use && instead of and.

Because of MSVC error:
warning C4067: unexpected tokens following preprocessor directive - expected a newline

BUG=None

Change-Id: I31b0d19f797c5a5bc67ce6fe2cfb614725861fa3
Reviewed-on: https://chromium-review.googlesource.com/1162802Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590561}
parent e9289caa
...@@ -664,7 +664,7 @@ TEST_F('CrSettingsAppearanceFontsPageTest', 'All', function() { ...@@ -664,7 +664,7 @@ TEST_F('CrSettingsAppearanceFontsPageTest', 'All', function() {
mocha.run(); mocha.run();
}); });
GEN('#if defined(OS_WIN) and defined(GOOGLE_CHROME_BUILD)'); GEN('#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)');
/** /**
* @constructor * @constructor
......
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