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.
Bug: 1110266
Change-Id: I5a906f5fd11894d2a618daced64235e8af558cd0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354835
Reviewed-by: Lei Zhang <[email protected]>
Commit-Queue: Sean McAllister <[email protected]>
Cr-Commit-Position: refs/heads/master@{#797905}
diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
index 01b35ac..dcea2ca0 100644
--- a/chrome/browser/after_startup_task_utils.cc
+++ b/chrome/browser/after_startup_task_utils.cc
@@ -119,7 +119,8 @@
void SetBrowserStartupIsComplete() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
+ defined(OS_CHROMEOS)
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
base::Process::Current().CreationTime();
@@ -127,7 +128,8 @@
UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime",
base::Time::Now() - process_creation_time);
}
-#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) ||
+ // defined(OS_CHROMEOS)
UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount",
g_after_startup_tasks.Get().size());
g_startup_complete_flag.Get().Set();
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 6cc1c85..2c59f8b3 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -390,7 +390,7 @@
EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"B", L"aA"));
}
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) {
static const KeyEventTestData kTestCtrlF = {
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 77f7fcd..68a92d3 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -211,7 +211,7 @@
#include "chrome/browser/first_run/upgrade_util_linux.h"
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#include "components/crash/core/app/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -937,12 +937,12 @@
}
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD)
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(chrome::GetChannelName());
}
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD)
#if defined(OS_MAC)
// Get the Keychain API to register for distributed notifications on the main
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc
index a0084c76..b15aed2 100644
--- a/chrome/browser/chrome_main_browsertest.cc
+++ b/chrome/browser/chrome_main_browsertest.cc
@@ -55,7 +55,7 @@
// ChromeMainTest.SecondLaunchWithIncognitoUrl is flaky on Win and Linux.
// http://crbug.com/130395
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_SecondLaunchWithIncognitoUrl DISABLED_SecondLaunchWithIncognitoUrl
#else
#define MAYBE_SecondLaunchWithIncognitoUrl SecondLaunchWithIncognitoUrl
diff --git a/chrome/browser/icon_loader_browsertest.cc b/chrome/browser/icon_loader_browsertest.cc
index c898b58..214fc4d 100644
--- a/chrome/browser/icon_loader_browsertest.cc
+++ b/chrome/browser/icon_loader_browsertest.cc
@@ -56,7 +56,7 @@
DISALLOW_COPY_AND_ASSIGN(TestIconLoader);
};
-#if !(defined(OS_LINUX) && defined(MEMORY_SANITIZER))
+#if !((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(MEMORY_SANITIZER))
const base::FilePath::CharType kGroupOnlyFilename[] =
FILE_PATH_LITERAL("unlikely-to-exist-file.txt");
@@ -74,7 +74,8 @@
runner.Run();
EXPECT_TRUE(test_loader.load_succeeded());
}
-#endif // !(defined(OS_LINUX) && defined(MEMORY_SANITIZER))
+#endif // !((defined(OS_LINUX) || defined(OS_CHROMEOS)) &&
+ // defined(MEMORY_SANITIZER))
#if defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(IconLoaderBrowserTest, LoadExeIcon) {
diff --git a/chrome/browser/locale_tests_browsertest.cc b/chrome/browser/locale_tests_browsertest.cc
index b53b8cf..e486f51 100644
--- a/chrome/browser/locale_tests_browsertest.cc
+++ b/chrome/browser/locale_tests_browsertest.cc
@@ -24,7 +24,7 @@
class ScopedLocale {
public:
explicit ScopedLocale(const char* locale) : locale_(locale) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
old_locale_ = getenv("LC_ALL");
static const struct {
@@ -47,7 +47,7 @@
}
~ScopedLocale() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
std::unique_ptr<base::Environment> env(base::Environment::Create());
if (old_locale_) {
env->SetVar("LC_ALL", old_locale_);
@@ -61,7 +61,7 @@
private:
std::string locale_;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
const char* old_locale_;
#endif
};
diff --git a/chrome/browser/mouse_events_interactive_uitest.cc b/chrome/browser/mouse_events_interactive_uitest.cc
index c5ee7c4..4b0ae1a0 100644
--- a/chrome/browser/mouse_events_interactive_uitest.cc
+++ b/chrome/browser/mouse_events_interactive_uitest.cc
@@ -109,7 +109,8 @@
WaitForTitle("ondblclick");
}
-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+ defined(OS_WIN)
// OS_MAC: Missing automation provider support: http://crbug.com/45892.
// OS_LINUX, OS_WIN: http://crbug.com/133361.
#define MAYBE_TestOnMouseOut DISABLED_TestOnMouseOut
@@ -165,7 +166,8 @@
EXPECT_EQ(success_title, done_title_watcher.WaitAndGetTitle());
}
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+ defined(OS_CHROMEOS)
// Test that a mouseleave is not triggered when showing a modal dialog.
// Sample regression: crbug.com/394672
// TODO: Make test pass on OS_WIN and OS_MAC
diff --git a/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc
index 1170186..ded436f 100644
--- a/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc
@@ -38,7 +38,7 @@
};
// Disabled due to flakiness: https://crbug.com/1092598
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_NewNavigationBeforeCommit DISABLED_NewNavigationBeforeCommit
#else
#define MAYBE_NewNavigationBeforeCommit NewNavigationBeforeCommit
@@ -52,7 +52,7 @@
}
// Disabled due to flakiness: https://crbug.com/1092598
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_ReloadBeforeCommit DISABLED_ReloadBeforeCommit
#else
#define MAYBE_ReloadBeforeCommit ReloadBeforeCommit
@@ -87,7 +87,7 @@
}
// Disabled due to flakiness: https://crbug.com/1092598
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_NewProvisionalNavigationBeforeCommit \
DISABLED_NewProvisionalNavigationBeforeCommit
#else
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
index 64e0d2f2..1beb25b4 100644
--- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
@@ -623,7 +623,7 @@
}
// Disabled due to flakiness: https://crbug.com/1092018
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_NewNavigationBeforeCommit DISABLED_NewNavigationBeforeCommit
#else
#define MAYBE_NewNavigationBeforeCommit NewNavigationBeforeCommit
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
index 2b3200a9..a54ced71 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -725,7 +725,7 @@
}
// TODO(crbug.com/986642): Flaky on Win and Linux.
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_NoPaintForEmptyDocumentInChildFrame \
DISABLED_NoPaintForEmptyDocumentInChildFrame
#else
@@ -1263,7 +1263,7 @@
}
// TODO(crbug.com/1009885): Flaky on Linux MSan builds.
-#if defined(MEMORY_SANITIZER) && defined(OS_LINUX)
+#if defined(MEMORY_SANITIZER) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
#define MAYBE_FirstMeaningfulPaintRecorded DISABLED_FirstMeaningfulPaintRecorded
#else
#define MAYBE_FirstMeaningfulPaintRecorded FirstMeaningfulPaintRecorded
@@ -2138,7 +2138,7 @@
ExpectFirstPaintMetricsTotalCount(1);
}
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_InitialForegroundTabChanged DISABLED_InitialForegroundTabChanged
#else
#define MAYBE_InitialForegroundTabChanged InitialForegroundTabChanged
diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc
index d49a1df..d789ee0 100644
--- a/chrome/browser/plugins/plugin_info_host_impl.cc
+++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -382,7 +382,7 @@
std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
if (cus_plugin_info) {
output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
if (cus_plugin_info->version != base::Version("0")) {
output->status = chrome::mojom::PluginStatus::kRestartRequired;
}
diff --git a/chrome/browser/printing/pwg_raster_converter_browsertest.cc b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
index eacacd8..405b6bea 100644
--- a/chrome/browser/printing/pwg_raster_converter_browsertest.cc
+++ b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
@@ -26,7 +26,7 @@
// Note that for some reason the generated PWG varies depending on the
// platform (32 or 64 bits) on Linux.
-#if defined(OS_LINUX) && defined(ARCH_CPU_32_BITS)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_32_BITS)
constexpr char kPdfToPwgRasterColorTestFile[] = "pdf_to_pwg_raster_test_32.pwg";
constexpr char kPdfToPwgRasterMonoTestFile[] =
"pdf_to_pwg_raster_mono_test_32.pwg";
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index 47a8c8df..2bdc8ea 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -94,7 +94,7 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
#endif
@@ -295,7 +295,7 @@
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index 8996948..0acace5 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -174,7 +174,8 @@
}
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
+ defined(OS_WIN)
content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
#endif
diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
index ef1631d..e6d9765 100644
--- a/chrome/browser/service_process/service_process_control_browsertest.cc
+++ b/chrome/browser/service_process/service_process_control_browsertest.cc
@@ -99,7 +99,7 @@
void SetUp() override {
InProcessBrowserTest::SetUp();
-#if defined(OS_MAC) || defined(OS_LINUX)
+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
// This should not be needed because TearDown() ends with a closed
// service_process_, but HistogramsTimeout and Histograms fail without this
// on Mac, and on Linux asan builds (https://crbug.com/1059446).
@@ -213,7 +213,8 @@
}
// Flaky on macOS, linux and windows: https://crbug.com/978948
-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
+ defined(OS_CHROMEOS)
#define MAYBE_LaunchAndReconnect DISABLED_LaunchAndReconnect
#else
#define MAYBE_LaunchAndReconnect LaunchAndReconnect
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index b8355e4..26dc3fc 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -37,7 +37,7 @@
#include "base/win/registry.h"
#endif
-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(ENABLE_WIDEVINE)
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
#endif
@@ -52,7 +52,7 @@
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
// The path to the external extension <id>.json files.
// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
@@ -66,15 +66,17 @@
// where it can find the latest component updated flash.
const base::FilePath::CharType kComponentUpdatedFlashHint[] =
FILE_PATH_LITERAL("latest-component-updated-flash");
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
+ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
// The name of the hint file that tells the latest component updated Widevine
// CDM directory. This file name should not be changed as otherwise existing
// Widevine CDMs might not be loaded.
const base::FilePath::CharType kComponentUpdatedWidevineCdmHint[] =
FILE_PATH_LITERAL("latest-component-updated-widevine-cdm");
-#endif // defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) &&
+ // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
#if defined(OS_CHROMEOS)
const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
@@ -205,7 +207,7 @@
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
@@ -374,7 +376,8 @@
cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
break;
-#if defined(OS_LINUX) && BUILDFLAG(BUNDLE_WIDEVINE_CDM)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
+ BUILDFLAG(BUNDLE_WIDEVINE_CDM)
case chrome::DIR_BUNDLED_WIDEVINE_CDM:
if (!GetComponentDirectory(&cur))
return false;
@@ -384,7 +387,8 @@
cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
#endif // !defined(OS_CHROMEOS)
break;
-#endif // defined(OS_LINUX) && BUILDFLAG(BUNDLE_WIDEVINE_CDM)
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) &&
+ // BUILDFLAG(BUNDLE_WIDEVINE_CDM)
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
@@ -505,7 +509,7 @@
break;
}
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
@@ -540,7 +544,7 @@
#endif
break;
-#if defined(OS_LINUX) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -566,7 +570,7 @@
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
-#endif // defined(OS_LINUX) || defined(OS_MAC)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
#if !defined(OS_ANDROID)
case chrome::DIR_GLOBAL_GCM_STORE:
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
@@ -574,7 +578,7 @@
cur = cur.Append(kGCMStoreDirname);
break;
#endif // !defined(OS_ANDROID)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
case chrome::FILE_COMPONENT_FLASH_HINT:
if (!base::PathService::Get(
chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
@@ -582,7 +586,7 @@
}
cur = cur.Append(kComponentUpdatedFlashHint);
break;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
case chrome::FILE_CHROME_OS_COMPONENT_FLASH:
cur = base::FilePath(kChromeOSComponentFlash);
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index 07955f2..5de8aab 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -59,7 +59,7 @@
// create it.
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
// definition manifest files that
// describe extensions which are to be
@@ -91,7 +91,7 @@
DIR_PNACL_BASE, // Full path to the base dir for PNaCl.
DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version
// (subdir of DIR_PNACL_BASE).
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
DIR_BUNDLED_WIDEVINE_CDM, // Full path to the directory containing the
// bundled Widevine CDM.
#if !defined(OS_CHROMEOS)
@@ -99,9 +99,9 @@
// downloaded by the component
// updater.
FILE_COMPONENT_WIDEVINE_CDM_HINT, // A file in a known location that points
- // to the component updated Widevine CDM.
+ // to the component updated Widevine CDM.
#endif // !defined(OS_CHROMEOS)
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
FILE_RESOURCES_PACK, // Full path to the .pak file containing binary data.
// This includes data for internal pages (e.g., html
// files and images), unless these resources are
@@ -120,7 +120,7 @@
DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
// supervised user whitelists are
// installed.
-#if defined(OS_LINUX) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
DIR_NATIVE_MESSAGING, // System directory where native messaging host
// manifest files are stored.
DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
@@ -135,10 +135,10 @@
DIR_GEN_TEST_DATA, // Directory where generated test data resides.
DIR_TEST_DATA, // Directory where unit test data resides.
DIR_TEST_TOOLS, // Directory where unit test tools reside.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to
// the component updated flash plugin.
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
FILE_CHROME_OS_COMPONENT_FLASH, // The location of component updated Flash on
// Chrome OS.
diff --git a/chrome/common/chrome_paths_internal.h b/chrome/common/chrome_paths_internal.h
index ab95d69..c23b3bb 100644
--- a/chrome/common/chrome_paths_internal.h
+++ b/chrome/common/chrome_paths_internal.h
@@ -45,7 +45,7 @@
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
// Gets the path to a safe default download directory for a user.
bool GetUserDownloadsDirectorySafe(base::FilePath* result);
#endif
diff --git a/chrome/common/chrome_paths_unittest.cc b/chrome/common/chrome_paths_unittest.cc
index d5521af6..bf4f1e81 100644
--- a/chrome/common/chrome_paths_unittest.cc
+++ b/chrome/common/chrome_paths_unittest.cc
@@ -61,7 +61,7 @@
#endif
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
TEST(ChromePaths, DefaultUserDataDir) {
std::unique_ptr<base::Environment> env(base::Environment::Create());
std::string orig_chrome_config_home;
diff --git a/chrome/common/component_flash_hint_file_linux.h b/chrome/common/component_flash_hint_file_linux.h
index 85694ce..a3b71cfb 100644
--- a/chrome/common/component_flash_hint_file_linux.h
+++ b/chrome/common/component_flash_hint_file_linux.h
@@ -7,9 +7,9 @@
#include "build/build_config.h"
-#if !defined(OS_LINUX)
+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
#error "This file only applies to the Linux component update of Flash."
-#endif // !defined(OS_LINUX)
+#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include <string>
diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc
index d1fc750..5c96858 100644
--- a/chrome/common/service_process_util.cc
+++ b/chrome/common/service_process_util.cc
@@ -116,7 +116,7 @@
command_line->AppendArg(switches::kPrefetchArgumentOther);
#endif // defined(OS_WIN)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
if (crash_reporter::IsCrashpadEnabled()) {
command_line->AppendSwitch(crash_reporter::kEnableCrashpad);
@@ -127,7 +127,7 @@
base::NumberToString(pid));
}
}
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
static const char* const kSwitchesToCopy[] = {
network::switches::kIgnoreUrlFetcherCertRequests,
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index e3a87fb..9530267 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -47,7 +47,7 @@
// somewhat flaky on other Linux.
#define MAYBE_ForceShutdown DISABLED_ForceShutdown
#else
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
#define MAYBE_ForceShutdown DISABLED_ForceShutdown
#else
#define MAYBE_ForceShutdown ForceShutdown
diff --git a/chrome/service/cloud_print/print_system.cc b/chrome/service/cloud_print/print_system.cc
index 4ceba96..277ec42 100644
--- a/chrome/service/cloud_print/print_system.cc
+++ b/chrome/service/cloud_print/print_system.cc
@@ -36,7 +36,7 @@
return base::GenerateGUID();
}
-#if defined(OS_LINUX) && !defined(USE_CUPS)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(USE_CUPS)
scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
const base::DictionaryValue*) {
return nullptr;
diff --git a/chrome/test/media_router/media_router_integration_browsertest.cc b/chrome/test/media_router/media_router_integration_browsertest.cc
index bd254f65..d3dbb9f4 100644
--- a/chrome/test/media_router/media_router_integration_browsertest.cc
+++ b/chrome/test/media_router/media_router_integration_browsertest.cc
@@ -441,7 +441,7 @@
}
// Crashes on Linux. http://crbug.com/1095068
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_OpenLocalMediaFileInNewTab DISABLED_OpenLocalMediaFileInNewTab
#else
#define MAYBE_OpenLocalMediaFileInNewTab OpenLocalMediaFileInNewTab
diff --git a/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc b/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
index 2913d2b7..f89ea64 100644
--- a/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
+++ b/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
@@ -66,7 +66,7 @@
RunFailToSendMessageTest();
}
-#if defined(OS_LINUX) && \
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
(BUILDFLAG(CFI_CAST_CHECK) || BUILDFLAG(CFI_ICALL_CHECK) || \
BUILDFLAG(CFI_ENFORCEMENT_TRAP) || BUILDFLAG(CFI_ENFORCEMENT_DIAGNOSTIC))
// https://crbug.com/966827. Flaky on Linux CFI.
diff --git a/chrome/test/v8/wasm_trap_handler_browsertest.cc b/chrome/test/v8/wasm_trap_handler_browsertest.cc
index ccc44b67..709d8c4 100644
--- a/chrome/test/v8/wasm_trap_handler_browsertest.cc
+++ b/chrome/test/v8/wasm_trap_handler_browsertest.cc
@@ -22,7 +22,7 @@
// support non-Android, Linux x64, and Windows x64. In the future more platforms
// will be supported. Though this file is a browser test that is not built on
// Android.
-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
constexpr bool kIsTrapHandlerSupported = true;
#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64)
constexpr bool kIsTrapHandlerSupported = true;
diff --git a/components/storage_monitor/removable_device_constants.cc b/components/storage_monitor/removable_device_constants.cc
index 0bc46cd..8dee5fb9 100644
--- a/components/storage_monitor/removable_device_constants.cc
+++ b/components/storage_monitor/removable_device_constants.cc
@@ -10,7 +10,7 @@
const char kFSUniqueIdPrefix[] = "UUID:";
const char kVendorModelSerialPrefix[] = "VendorModelSerial:";
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:";
#endif
diff --git a/components/storage_monitor/removable_device_constants.h b/components/storage_monitor/removable_device_constants.h
index 97a059f..ed1a4b9c 100644
--- a/components/storage_monitor/removable_device_constants.h
+++ b/components/storage_monitor/removable_device_constants.h
@@ -15,7 +15,7 @@
extern const char kFSUniqueIdPrefix[];
extern const char kVendorModelSerialPrefix[];
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
extern const char kVendorModelVolumeStoragePrefix[];
#endif
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
index 5f932db41..55cd1b5 100644
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -66,7 +66,7 @@
#include "ui/gfx/geometry/vector2d.h"
#include "v8/include/v8.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#include "pdf/pdfium/pdfium_font_linux.h"
#endif
@@ -395,7 +395,7 @@
config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
FPDF_InitLibraryWithConfig(&config);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
InitializeLinuxFontMapper();
#endif
@@ -451,7 +451,7 @@
IFSDK_PAUSE::user = nullptr;
IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
// PreviewModeClient does not know its pp::Instance.
SetLastInstance(client_->GetPluginInstance());
#endif
@@ -923,7 +923,7 @@
KillFormFocus();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
SetLastInstance(client_->GetPluginInstance());
#endif
@@ -2969,7 +2969,7 @@
DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
last_progressive_start_time_ = base::Time::Now();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
SetLastInstance(client_->GetPluginInstance());
#endif
@@ -3461,7 +3461,7 @@
FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
}
most_visible_page_ = index;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
SetLastInstance(client_->GetPluginInstance());
#endif
if (most_visible_page_ != -1 && called_do_document_action_) {
diff --git a/printing/print_settings.cc b/printing/print_settings.cc
index 49173f4..e73669a 100644
--- a/printing/print_settings.cc
+++ b/printing/print_settings.cc
@@ -289,9 +289,9 @@
#endif
is_modifiable_ = true;
pages_per_sheet_ = 1;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
advanced_settings_.clear();
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
send_user_info_ = false;
username_.clear();
diff --git a/printing/print_settings.h b/printing/print_settings.h
index 8af54b0e1..63ae538 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -20,11 +20,11 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#include <map>
#include "base/values.h"
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
namespace printing {
@@ -74,9 +74,9 @@
}
};
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
using AdvancedSettings = std::map<std::string, base::Value>;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
PrintSettings();
~PrintSettings();
@@ -211,12 +211,12 @@
pages_per_sheet_ = pages_per_sheet;
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
AdvancedSettings& advanced_settings() { return advanced_settings_; }
const AdvancedSettings& advanced_settings() const {
return advanced_settings_;
}
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
void set_send_user_info(bool send_user_info) {
@@ -310,10 +310,10 @@
// Number of pages per sheet.
int pages_per_sheet_;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
// Advanced settings.
AdvancedSettings advanced_settings_;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
// Whether to send user info.
