Remove redundant OS_CHROMEOS checks
The OS_CHROMEOS define implies OS_LINUX. So a preprocessor conditional like:
if defined(OS_LINUX) || defined(OS_CHROMEOS)
is redundant and should just be:
if defined(OS_LINUX).
Bug: 290185 (kind of)
Change-Id: I382c636d2641ae95b2a00516fbfd3a494640a9fb
Reviewed-on: https://chromium-review.googlesource.com/534776
Reviewed-by: Brett Wilson <[email protected]>
Reviewed-by: Dan Erat <[email protected]>
Commit-Queue: Michael Giuffrida <[email protected]>
Cr-Commit-Position: refs/heads/master@{#491356}diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index e1ac7d3e..051a5bb8 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -892,8 +892,7 @@
{"Learning", kSpeculativeResourcePrefetchingLearning,
arraysize(kSpeculativeResourcePrefetchingLearning), nullptr}};
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
const FeatureEntry::FeatureParam kPauseBackgroundTabsMinimalEngagment[] = {
{pausetabs::kFeatureName, pausetabs::kModeParamMinimal}};
@@ -1821,12 +1820,12 @@
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
switches::kDisableTranslateNewUX)},
#endif // OS_MACOSX
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_WIN)
{"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName,
flag_descriptions::kTranslate2016q2UiDescription,
kOsCrOS | kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
-#endif // OS_LINUX || OS_WIN || OS_CHROMEOS
+#endif // OS_LINUX || OS_WIN
{"translate-lang-by-ulp", flag_descriptions::kTranslateLanguageByUlpName,
flag_descriptions::kTranslateLanguageByUlpDescription, kOsAll,
FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
@@ -2915,8 +2914,7 @@
flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
{"omnibox-entity-suggestions",
flag_descriptions::kOmniboxEntitySuggestionsName,
flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
@@ -2927,8 +2925,7 @@
{"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName,
flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableNewAppMenuIcon)},
-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
- // defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if defined(OS_ANDROID)
{"enable-custom-feedback-ui",
@@ -2995,8 +2992,7 @@
FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)},
#endif // OS_ANDROID
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
{pausetabs::kFeatureName, flag_descriptions::kPauseBackgroundTabsName,
flag_descriptions::kPauseBackgroundTabsDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(pausetabs::kFeature,
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index e187362..697a8ff 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -137,7 +137,7 @@
subresource_filter::ContentRulesetService*
subresource_filter_ruleset_service() override;
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
void StartAutoupdateTimer() override;
#endif
@@ -297,7 +297,7 @@
std::unique_ptr<ChromeResourceDispatcherHostDelegate>
resource_dispatcher_host_delegate_;
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
base::RepeatingTimer autoupdate_timer_;
// Gets called by autoupdate timer to see if browser needs restart and can be
@@ -305,7 +305,7 @@
void OnAutoupdateTimer();
bool CanAutorestartForUpdate() const;
void RestartBackgroundInstance();
-#endif // defined(OS_WIN) || defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
// component updater is normally not used under ChromeOS due
// to concerns over integrity of data shared between profiles,
diff --git a/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
index c494ba3..289963b 100644
--- a/chrome/browser/dom_distiller/tab_utils_browsertest.cc
+++ b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
@@ -86,7 +86,7 @@
bool loaded_distiller_page_;
};
-#if (defined(OS_LINUX) && defined(OS_CHROMEOS))
+#if defined(OS_CHROMEOS)
#define MAYBE_TestSwapWebContents DISABLED_TestSwapWebContents
#else
#define MAYBE_TestSwapWebContents TestSwapWebContents
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 57e7f29..e4d273b 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -875,7 +875,7 @@
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 50703f2..f607992 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2444,8 +2444,7 @@
#endif // defined(OS_WIN)
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
const char kOmniboxEntitySuggestionsName[] = "Omnibox entity suggestions";
const char kOmniboxEntitySuggestionsDescription[] =
@@ -2465,8 +2464,7 @@
const char kEnableNewAppMenuIconDescription[] =
"Use the new app menu icon with update notification animations.";
-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
- // defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/interstitials/chrome_controller_client.cc b/chrome/browser/interstitials/chrome_controller_client.cc
index 736ee9c..ea9d7be 100644
--- a/chrome/browser/interstitials/chrome_controller_client.cc
+++ b/chrome/browser/interstitials/chrome_controller_client.cc
@@ -129,8 +129,8 @@
ChromeControllerClient::~ChromeControllerClient() {}
bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
- defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+ defined(OS_WIN)
return true;
#else
return false;
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index 241f8b93..1381afa 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -106,7 +106,7 @@
}
#endif // #if !defined(OS_ANDROID)
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_LINUX)
return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE;
#else
return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE;
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 0372c458..0eb9d41 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -666,7 +666,7 @@
}
#endif // BUILDFLAG(ENABLE_APP_LIST)
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_WIN)
// Dictionary sync is enabled by default.
if (!disabled_types.Has(syncer::DICTIONARY)) {
sync_service->RegisterDataTypeController(
@@ -674,7 +674,7 @@
syncer::DICTIONARY, error_callback, this, syncer::GROUP_UI,
BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
}
-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+#endif // defined(OS_LINUX) || defined(OS_WIN)
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
sync_service->RegisterDataTypeController(
diff --git a/chrome/browser/ui/sad_tab.cc b/chrome/browser/ui/sad_tab.cc
index f33f7f8c..465ab1e 100644
--- a/chrome/browser/ui/sad_tab.cc
+++ b/chrome/browser/ui/sad_tab.cc
@@ -8,6 +8,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "chrome/browser/net/referrer.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -182,7 +183,7 @@
// Only show incognito suggestion if not already in Incognito mode.
if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_MACOSX) || defined(OS_LINUX)
// Note: on macOS, Linux and ChromeOS, the first bullet is either one of
// IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
// followed by one of the above suggestions.
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 71f345e1..0474098 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -600,7 +600,7 @@
else
target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if !defined(OS_LINUX)
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index d9cbe42..a71c7203 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1048,8 +1048,7 @@
extern const char kEnableInputImeAPI[] = "enable-input-ime-api";
#endif
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
extern const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
#endif
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index f24ee09..4ac9fa1 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -332,8 +332,7 @@
extern const char kEnableInputImeAPI[];
#endif
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
extern const char kEnableNewAppMenuIcon[];
#endif
diff --git a/content/common/content_switches_internal.cc b/content/common/content_switches_internal.cc
index 105a9d1..0752026 100644
--- a/content/common/content_switches_internal.cc
+++ b/content/common/content_switches_internal.cc
@@ -27,7 +27,7 @@
#endif
bool IsUseZoomForDSFEnabledByDefault() {
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
return true;
#elif defined(OS_WIN)
return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault);
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 1adcde8..94ac253 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -85,7 +85,7 @@
DVLOG(2) << "DefaultConfigDirectory: " << dir.value();
return dir;
}
-#endif // !defined(IS_CHROMEOS)
+#endif // !defined(OS_CHROMEOS)
// On non-Chrome OS platforms, return the default config directory. On Chrome OS
// test images, return a read-only directory with fake root CA certs (which are
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index 9153dc5..49cab45 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -38,7 +38,7 @@
return weak_ptr_factory_.GetWeakPtr();
}
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
void BluetoothAdapter::Shutdown() {
NOTIMPLEMENTED();
}
diff --git a/device/bluetooth/bluetooth_adapter.h b/device/bluetooth/bluetooth_adapter.h
index bdefc09b..ac3e19b1 100644
--- a/device/bluetooth/bluetooth_adapter.h
+++ b/device/bluetooth/bluetooth_adapter.h
@@ -117,6 +117,7 @@
BluetoothDevice* device,
const std::string& old_address) {}
+// TODO(crbug.com/732991): Update comment and fix redundant #ifs throughout.
#if defined(OS_CHROMEOS) || defined(OS_LINUX)
// This function is implemented for ChromeOS only, and the support for
// Android, MaxOS and Windows should be added on demand in the future.
@@ -262,7 +263,7 @@
// Returns a weak pointer to an existing adapter for testing purposes only.
base::WeakPtr<BluetoothAdapter> GetWeakPtrForTesting();
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
// Shutdown the adapter: tear down and clean up all objects owned by
// BluetoothAdapter. After this call, the BluetoothAdapter will behave as if
// no Bluetooth controller exists in the local system. |IsPresent| will return
@@ -444,7 +445,7 @@
const CreateAdvertisementCallback& callback,
const AdvertisementErrorCallback& error_callback) = 0;
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
// Sets the interval between two consecutive advertisements. Valid ranges
// for the interval are from 20ms to 10.24 seconds, with min <= max.
// Note: This is a best effort. The actual interval may vary non-trivially
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index cee5e1d..f1e62dc 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -38,7 +38,7 @@
base::LazyInstance<base::WeakPtr<BluetoothAdapter>>::Leaky default_adapter =
LAZY_INSTANCE_INITIALIZER;
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_LINUX)
typedef std::vector<BluetoothAdapterFactory::AdapterCallback>
AdapterCallbackList;
@@ -59,7 +59,7 @@
}
adapter_callbacks.Get().clear();
}
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || defined(OS_LINUX)
} // namespace
@@ -76,8 +76,8 @@
// instance even on platforms that would otherwise not support it.
if (default_adapter.Get())
return true;
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
- defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_LINUX) || \
+ defined(OS_MACOSX)
return true;
#else
return false;
@@ -99,7 +99,7 @@
return base::win::GetVersion() >= base::win::VERSION_WIN10;
#elif defined(OS_MACOSX)
return base::mac::IsAtLeastOS10_10();
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
+#elif defined(OS_LINUX)
return true;
#else
return false;
@@ -110,7 +110,7 @@
void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
DCHECK(IsBluetoothSupported());
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_LINUX)
if (!default_adapter.Get()) {
default_adapter.Get() =
BluetoothAdapter::CreateAdapter(base::Bind(&RunAdapterCallbacks));
@@ -119,20 +119,20 @@
if (!default_adapter.Get()->IsInitialized())
adapter_callbacks.Get().push_back(callback);
-#else // !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#else // !defined(OS_WIN) && !defined(OS_LINUX)
if (!default_adapter.Get()) {
default_adapter.Get() =
BluetoothAdapter::CreateAdapter(BluetoothAdapter::InitCallback());
}
DCHECK(default_adapter.Get()->IsInitialized());
-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif // defined(OS_WIN) || defined(OS_LINUX)
if (default_adapter.Get()->IsInitialized())
callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get().get()));
}
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
// static
void BluetoothAdapterFactory::Shutdown() {
if (default_adapter.Get())
diff --git a/device/bluetooth/bluetooth_adapter_factory.h b/device/bluetooth/bluetooth_adapter_factory.h
index 16f8457..7217c2f 100644
--- a/device/bluetooth/bluetooth_adapter_factory.h
+++ b/device/bluetooth/bluetooth_adapter_factory.h
@@ -52,7 +52,7 @@
// use.
static void GetAdapter(const AdapterCallback& callback);
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
// Calls |BluetoothAdapter::Shutdown| on the adapter if
// present.
static void Shutdown();
diff --git a/device/bluetooth/bluetooth_advertisement.h b/device/bluetooth/bluetooth_advertisement.h
index 70659f3..d379f72 100644
--- a/device/bluetooth/bluetooth_advertisement.h
+++ b/device/bluetooth/bluetooth_advertisement.h
@@ -17,6 +17,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
+#include "build/build_config.h"
#include "device/bluetooth/bluetooth_export.h"
namespace device {
@@ -37,7 +38,7 @@
// is not registered.
ERROR_ADVERTISEMENT_INVALID_LENGTH, // Advertisement is not of a valid
// length.
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
ERROR_INVALID_ADVERTISEMENT_INTERVAL, // Advertisement interval specified
// is out of valid range.
ERROR_RESET_ADVERTISING, // Error while resetting advertising.
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index ac9dc0ea..91334697 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -22,6 +22,7 @@
#include "base/optional.h"
#include "base/strings/string16.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "device/bluetooth/bluetooth_common.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_remote_gatt_service.h"
@@ -203,7 +204,7 @@
// and metrics logging,
virtual uint32_t GetBluetoothClass() const = 0;
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
// Returns the transport type of the device. Some devices only support one
// of BR/EDR or LE, and some support both.
virtual BluetoothTransport GetType() const = 0;
diff --git a/device/bluetooth/bluetooth_local_gatt_characteristic.cc b/device/bluetooth/bluetooth_local_gatt_characteristic.cc
index e4350c0..70ab356 100644
--- a/device/bluetooth/bluetooth_local_gatt_characteristic.cc
+++ b/device/bluetooth/bluetooth_local_gatt_characteristic.cc
@@ -5,11 +5,12 @@
#include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
#include "base/logging.h"
+#include "build/build_config.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
namespace device {
-#if !defined(OS_CHROMEOS) && !defined(OS_LINUX)
+#if !defined(OS_LINUX)
// static
base::WeakPtr<BluetoothLocalGattCharacteristic>
BluetoothLocalGattCharacteristic::Create(const BluetoothUUID& uuid,
diff --git a/device/bluetooth/bluetooth_local_gatt_descriptor.cc b/device/bluetooth/bluetooth_local_gatt_descriptor.cc
index 2ffa979..0ab463bb 100644
--- a/device/bluetooth/bluetooth_local_gatt_descriptor.cc
+++ b/device/bluetooth/bluetooth_local_gatt_descriptor.cc
@@ -5,10 +5,11 @@
#include "device/bluetooth/bluetooth_local_gatt_descriptor.h"
#include "base/logging.h"
+#include "build/build_config.h"
namespace device {
-#if !defined(OS_CHROMEOS) && !defined(OS_LINUX)
+#if !defined(OS_LINUX)
// static
base::WeakPtr<BluetoothLocalGattDescriptor>
BluetoothLocalGattDescriptor::Create(
diff --git a/device/bluetooth/bluetooth_local_gatt_service.cc b/device/bluetooth/bluetooth_local_gatt_service.cc
index 000d6ab..86da8c9b 100644
--- a/device/bluetooth/bluetooth_local_gatt_service.cc
+++ b/device/bluetooth/bluetooth_local_gatt_service.cc
@@ -4,9 +4,11 @@
#include "device/bluetooth/bluetooth_local_gatt_service.h"
+#include "build/build_config.h"
+
namespace device {
-#if !defined(OS_CHROMEOS) && !defined(OS_LINUX)
+#if !defined(OS_LINUX)
// static
base::WeakPtr<BluetoothLocalGattService> BluetoothLocalGattService::Create(
BluetoothAdapter* adapter,
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
index 69fb27f..9fec1ef 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
@@ -18,6 +18,7 @@
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
+#include "build/build_config.h"
#include "content/public/browser/browser_thread.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
@@ -81,7 +82,7 @@
"An advertisement is already advertising";
const char kStatusAdvertisementDoesNotExist[] =
"This advertisement does not exist";
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
const char kStatusInvalidAdvertisingInterval[] =
"Invalid advertising interval specified.";
#endif
@@ -1269,7 +1270,7 @@
}
void BluetoothLowEnergySetAdvertisingIntervalFunction::DoWork() {
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
BluetoothLowEnergyEventRouter* event_router =
GetEventRouter(browser_context());
event_router->adapter()->SetAdvertisingInterval(
@@ -1290,7 +1291,7 @@
void BluetoothLowEnergySetAdvertisingIntervalFunction::ErrorCallback(
device::BluetoothAdvertisement::ErrorCode status) {
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
switch (status) {
case device::BluetoothAdvertisement::ErrorCode::
ERROR_INVALID_ADVERTISEMENT_INTERVAL:
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index af9ee8d..0763eccc 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -52,7 +52,7 @@
#include "extensions/shell/browser/shell_network_controller_chromeos.h"
#endif
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_LINUX)
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "device/bluetooth/dbus/bluez_dbus_manager.h"
#endif
diff --git a/net/nqe/network_quality_estimator.cc b/net/nqe/network_quality_estimator.cc
index 0b9da149..e0b0f94 100644
--- a/net/nqe/network_quality_estimator.cc
+++ b/net/nqe/network_quality_estimator.cc
@@ -1454,8 +1454,7 @@
case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
break;
case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI:
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
- defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN)
network_id.id = GetWifiSSID();
#endif
break;
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 372d330..4f82347 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -707,7 +707,7 @@
}
ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX)
return max_scale_factor_;
#else
return GetSupportedScaleFactors().back();
@@ -762,8 +762,7 @@
} else {
supported_scale_factors.push_back(SCALE_FACTOR_100P);
}
-#elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
- defined(OS_WIN)
+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
supported_scale_factors.push_back(SCALE_FACTOR_200P);
#endif
ui::SetSupportedScaleFactors(supported_scale_factors);
diff --git a/ui/gfx/font_render_params.h b/ui/gfx/font_render_params.h
index ade3672..39d72e3 100644
--- a/ui/gfx/font_render_params.h
+++ b/ui/gfx/font_render_params.h
@@ -113,8 +113,7 @@
GFX_EXPORT void ClearFontRenderParamsCacheForTest();
#endif
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || \
- (defined(OS_ANDROID) && BUILDFLAG(ENABLE_VR))
+#if defined(OS_LINUX) || (defined(OS_ANDROID) && BUILDFLAG(ENABLE_VR))
// Gets the device scale factor to query the FontRenderParams.
GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
