Fixing OS Macros definitions for ChromeOS

Bug: 1117534
Change-Id: I34823045b6e3364edbab94fd3eb74b8b1ef02d6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2397619Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Palak Agarwal <agpalak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805411}

chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc

@@ -50,7 +50,7 @@ class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase {
 // TODO(crbug.com/910216): De-flake this for ChromeOs.
 // TODO(crbug.com/984879): De-flake this for ASAN/MSAN Linux.
 #if defined(OS_CHROMEOS) ||                                        \
-    ((defined(OS_LINUX) || defined(OS_CHROMEOS)) &&                \
+    (defined(OS_LINUX) &&                                          \
      (defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER))) || \
     (defined(OS_WIN) && defined(ADDRESS_SANITIZER))
 #define MAYBE_VerifyEncryption DISABLED_VerifyEncryption

chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc

@@ -90,11 +90,10 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetDisplayMediaBrowserTestWithPicker,
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
 #define MAYBE_GetDisplayMediaVideoAndAudio DISABLED_GetDisplayMediaVideoAndAudio
 // On linux debug bots, it's flaky as well.
-#elif ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG))
+#elif (defined(OS_LINUX) && !defined(NDEBUG))
 #define MAYBE_GetDisplayMediaVideoAndAudio DISABLED_GetDisplayMediaVideoAndAudio
 // On linux asan bots, it's flaky as well - msan and other rel bot are fine.
-#elif ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
-       defined(ADDRESS_SANITIZER))
+#elif (defined(OS_LINUX) && defined(ADDRESS_SANITIZER))
 #define MAYBE_GetDisplayMediaVideoAndAudio DISABLED_GetDisplayMediaVideoAndAudio
 #else
 #define MAYBE_GetDisplayMediaVideoAndAudio GetDisplayMediaVideoAndAudio

chrome/browser/media/webrtc/webrtc_log_uploader.cc

@@ -347,7 +347,7 @@ void WebRtcLogUploader::SetupMultipart(
   const char product[] = "Chrome";
 #elif defined(OS_MAC)
   const char product[] = "Chrome_Mac";
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
+#elif defined(OS_LINUX)
 #if !defined(ADDRESS_SANITIZER)
   const char product[] = "Chrome_Linux";
 #else