diff options
5 files changed, 9 insertions, 9 deletions
diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 6735f6a..fa067c8 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -59,7 +59,7 @@ const size_t kTooBigAllocSize = INT_MAX; // Detect runtime TCMalloc bypasses. bool IsTcMallocBypassed() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) // This should detect a TCMalloc bypass from Valgrind. char* g_slice = getenv("G_SLICE"); if (g_slice && !strcmp(g_slice, "always-malloc")) @@ -230,7 +230,7 @@ TEST(SecurityTest, CallocOverflow) { } } -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) +#if defined(OS_LINUX) && defined(__x86_64__) // Check if ptr1 and ptr2 are separated by less than size chars. bool ArePointersToSameArea(void* ptr1, void* ptr2, size_t size) { ptrdiff_t ptr_diff = reinterpret_cast<char*>(std::max(ptr1, ptr2)) - @@ -286,6 +286,6 @@ TEST(SecurityTest, TCMALLOC_TEST(RandomMemoryAllocations)) { EXPECT_FALSE(impossible_random_address); } -#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) +#endif // defined(OS_LINUX) && defined(__x86_64__) } // namespace diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index 89632d9a..a3783da 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -378,7 +378,7 @@ class ProtocolHandlerRegistryTest : public testing::Test { // ProtocolHandlerRegistryTest tests are flaky on Linux & ChromeOS. // http://crbug.com/133023 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) #define MAYBE_AcceptProtocolHandlerHandlesProtocol \ DISABLED_AcceptProtocolHandlerHandlesProtocol #define MAYBE_DeniedProtocolIsntHandledUntilAccepted \ @@ -404,7 +404,7 @@ class ProtocolHandlerRegistryTest : public testing::Test { #define MAYBE_TestIsHandledProtocolWorksOnIOThread \ TestIsHandledProtocolWorksOnIOThread #define MAYBE_TestInstallDefaultHandler TestInstallDefaultHandler -#endif // defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) TEST_F(ProtocolHandlerRegistryTest, MAYBE_AcceptProtocolHandlerHandlesProtocol) { diff --git a/chrome/browser/feedback/feedback_uploader_unittest.cc b/chrome/browser/feedback/feedback_uploader_unittest.cc index c795c18..b504be0 100644 --- a/chrome/browser/feedback/feedback_uploader_unittest.cc +++ b/chrome/browser/feedback/feedback_uploader_unittest.cc @@ -106,7 +106,7 @@ class FeedbackUploaderTest : public testing::Test { size_t expected_reports_; }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) #define MAYBE_QueueMultiple QueueMultiple #else // crbug.com/330547 diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index fd352eb..1f46d6a 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) { NavigateAndWaitForAuth(url); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) // This test is flaky inside the Linux SUID sandbox. // http://crbug.com/130116 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitPerPage) { @@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) { } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) // This test is flaky inside the Linux SUID sandbox: http://crbug.com/130116 // Also flaky on Mac: http://crbug.com/295193 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) { diff --git a/third_party/tcmalloc/chromium/src/system-alloc.cc b/third_party/tcmalloc/chromium/src/system-alloc.cc index 2141d413e..d1ae71d 100644 --- a/third_party/tcmalloc/chromium/src/system-alloc.cc +++ b/third_party/tcmalloc/chromium/src/system-alloc.cc @@ -100,7 +100,7 @@ template <> bool CheckAddressBits<8 * sizeof(void*)>(uintptr_t ptr) { return true; } -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) +#if defined(OS_LINUX) && defined(__x86_64__) #define ASLR_IS_SUPPORTED #endif |