Commit be244d99 authored by Hiroki Sato's avatar Hiroki Sato Committed by Commit Bot

Replace CHROMEOS macro with OS_CHROMEOS

CHROMEOS macro is defined in third_party/webrtc.
This CL replaces it with more appropriate macro.

Bug: None
Change-Id: I7c5c5928424c026b1fb679814617c1134c0d5537
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2022584Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Commit-Queue: Hiroki Sato <hirokisato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735658}
parent 8486d5ec
...@@ -55,7 +55,7 @@ class ValidationFunction : public ExtensionFunction { ...@@ -55,7 +55,7 @@ class ValidationFunction : public ExtensionFunction {
using ChromeExtensionFunctionUnitTest = ExtensionServiceTestBase; using ChromeExtensionFunctionUnitTest = ExtensionServiceTestBase;
#if defined(OS_WIN) || defined(CHROMEOS) #if defined(OS_WIN) || defined(OS_CHROMEOS)
#define MAYBE_SimpleFunctionTest DISABLED_SimpleFunctionTest #define MAYBE_SimpleFunctionTest DISABLED_SimpleFunctionTest
#else #else
#define MAYBE_SimpleFunctionTest SimpleFunctionTest #define MAYBE_SimpleFunctionTest SimpleFunctionTest
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include "net/dns/mock_host_resolver.h" #include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#if defined(CHROMEOS) #if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chromeos/constants/chromeos_switches.h" #include "chromeos/constants/chromeos_switches.h"
#endif #endif
......
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