OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 | 710 |
711 // This should not register with the OS, if it does the delegate | 711 // This should not register with the OS, if it does the delegate |
712 // will assert for us. We don't need to wait for the message loop | 712 // will assert for us. We don't need to wait for the message loop |
713 // as it should not go through to the shell worker. | 713 // as it should not go through to the shell worker. |
714 registry()->OnAcceptRegisterProtocolHandler(ph_do2); | 714 registry()->OnAcceptRegisterProtocolHandler(ph_do2); |
715 } | 715 } |
716 | 716 |
717 #if defined(OS_LINUX) | 717 #if defined(OS_LINUX) |
718 // TODO(benwells): When Linux support is more reliable and | 718 // TODO(benwells): When Linux support is more reliable and |
719 // http://crbut.com/88255 is fixed this test will pass. | 719 // http://crbut.com/88255 is fixed this test will pass. |
720 #define MAYBE_TestOSRegistrationFailure FAILS_TestOSRegistrationFailure | 720 #define MAYBE_TestOSRegistrationFailure DISABLED_TestOSRegistrationFailure |
721 #else | 721 #else |
722 #define MAYBE_TestOSRegistrationFailure TestOSRegistrationFailure | 722 #define MAYBE_TestOSRegistrationFailure TestOSRegistrationFailure |
723 #endif | 723 #endif |
724 | 724 |
725 // TODO(smckay): This is much more appropriately an integration | 725 // TODO(smckay): This is much more appropriately an integration |
726 // test. Make that so, then update the | 726 // test. Make that so, then update the |
727 // ShellIntegretion{Delegate,Observer,Worker} test classes we use to fully | 727 // ShellIntegretion{Delegate,Observer,Worker} test classes we use to fully |
728 // isolate this test from the FILE thread. | 728 // isolate this test from the FILE thread. |
729 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestOSRegistrationFailure) { | 729 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestOSRegistrationFailure) { |
730 ProtocolHandler ph_do = CreateProtocolHandler("do", "test1"); | 730 ProtocolHandler ph_do = CreateProtocolHandler("do", "test1"); |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 | 886 |
887 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) { | 887 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) { |
888 RecreateRegistry(false); | 888 RecreateRegistry(false); |
889 registry()->AddPredefinedHandler(CreateProtocolHandler( | 889 registry()->AddPredefinedHandler(CreateProtocolHandler( |
890 "test", GURL("http://test.com/%s"), "Test")); | 890 "test", GURL("http://test.com/%s"), "Test")); |
891 registry()->InitProtocolSettings(); | 891 registry()->InitProtocolSettings(); |
892 std::vector<std::string> protocols; | 892 std::vector<std::string> protocols; |
893 registry()->GetRegisteredProtocols(&protocols); | 893 registry()->GetRegisteredProtocols(&protocols); |
894 ASSERT_EQ(static_cast<size_t>(1), protocols.size()); | 894 ASSERT_EQ(static_cast<size_t>(1), protocols.size()); |
895 } | 895 } |
OLD | NEW |