remove redundant ifdefs

chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 363 matching lines @@
   content::TestBrowserThread io_thread_;
 
   scoped_ptr<TestingProfile> profile_;
   FakeDelegate* delegate_;  // Registry assumes ownership of delegate_.
   scoped_ptr<ProtocolHandlerRegistry> registry_;
   ProtocolHandler test_protocol_handler_;
 };
 
 // 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 \
     DISABLED_DeniedProtocolIsntHandledUntilAccepted
 #define MAYBE_TestStartsAsDefault DISABLED_TestStartsAsDefault
 #define MAYBE_TestRemoveHandlerRemovesDefault \
     DISABLED_TestRemoveHandlerRemovesDefault
 #define MAYBE_TestClearDefaultGetsPropagatedToIO \
     DISABLED_TestClearDefaultGetsPropagatedToIO
 #define MAYBE_TestIsHandledProtocolWorksOnIOThread \
     DISABLED_TestIsHandledProtocolWorksOnIOThread
 #define MAYBE_TestInstallDefaultHandler \
     DISABLED_TestInstallDefaultHandler
 #else
 #define MAYBE_AcceptProtocolHandlerHandlesProtocol \
     AcceptProtocolHandlerHandlesProtocol
 #define MAYBE_DeniedProtocolIsntHandledUntilAccepted \
     DeniedProtocolIsntHandledUntilAccepted
 #define MAYBE_TestStartsAsDefault TestStartsAsDefault
 #define MAYBE_TestRemoveHandlerRemovesDefault TestRemoveHandlerRemovesDefault
 #define MAYBE_TestClearDefaultGetsPropagatedToIO \
     TestClearDefaultGetsPropagatedToIO
 #define MAYBE_TestIsHandledProtocolWorksOnIOThread \
     TestIsHandledProtocolWorksOnIOThread
 #define MAYBE_TestInstallDefaultHandler TestInstallDefaultHandler
-#endif  // defined(OS_CHROMEOS)
+#endif  // defined(OS_LINUX)
 
 TEST_F(ProtocolHandlerRegistryTest,
        MAYBE_AcceptProtocolHandlerHandlesProtocol) {
   ASSERT_FALSE(registry()->IsHandledProtocol("test"));
   registry()->OnAcceptRegisterProtocolHandler(test_protocol_handler());
   ASSERT_TRUE(registry()->IsHandledProtocol("test"));
 }
 
 TEST_F(ProtocolHandlerRegistryTest,
        MAYBE_DeniedProtocolIsntHandledUntilAccepted) {
@@ skipping 502 matching lines @@
 
 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) {
   RecreateRegistry(false);
   registry()->AddPredefinedHandler(CreateProtocolHandler(
       "test", GURL("http://test.com/%s"), "Test"));
   registry()->InitProtocolSettings();
   std::vector<std::string> protocols;
   registry()->GetRegisteredProtocols(&protocols);
   ASSERT_EQ(static_cast<size_t>(1), protocols.size());
 }