Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1005)

Unified Diff: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

Issue 237673002: remove redundant ifdefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/security_unittest.cc ('k') | chrome/browser/feedback/feedback_uploader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index d0bc463b635241edd3e5a31b53282bc411feb23d..b82cb0650be4b36f58aad080c01cdab498b08d6d 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -381,7 +381,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 \
@@ -407,7 +407,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) {
« no previous file with comments | « base/security_unittest.cc ('k') | chrome/browser/feedback/feedback_uploader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698