diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 0e747ec01c1f36..858e1d9d3e9f95 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -975,27 +975,6 @@ # * String pattern or, if starting with a slash, a regular expression. # * Sequence of strings to show when the pattern matches. _DEPRECATED_MOJO_TYPES = ( - ( - r'/\bmojo::AssociatedBinding\b', - ( - 'mojo::AssociatedBinding is deprecated.', - 'Use mojo::AssociatedReceiver instead.', - ), - ), - ( - r'/\bmojo::AssociatedBindingSet\b', - ( - 'mojo::AssociatedBindingSet is deprecated.', - 'Use mojo::AssociatedReceiverSet instead.', - ), - ), - ( - r'/\bmojo::AssociatedInterfacePtr\b', - ( - 'mojo::AssociatedInterfacePtr is deprecated.', - 'Use mojo::AssociatedRemote instead.', - ), - ), ( r'/\bmojo::AssociatedInterfacePtrInfo\b', ( @@ -1010,20 +989,6 @@ 'Use mojo::PendingAssociatedReceiver instead.', ), ), - ( - r'/\bmojo::Binding\b', - ( - 'mojo::Binding is deprecated.', - 'Use mojo::Receiver instead.', - ), - ), - ( - r'/\bmojo::BindingSet\b', - ( - 'mojo::BindingSet is deprecated.', - 'Use mojo::ReceiverSet instead.', - ), - ), ( r'/\bmojo::InterfacePtr\b', ( @@ -1052,58 +1017,6 @@ 'Use mojo::Remote::BindNewPipeAndPassReceiver() instead.', ), ), - ( - r'/\bmojo::MakeRequestAssociatedWithDedicatedPipe\b', - ( - 'mojo::MakeRequest is deprecated.', - 'Use mojo::AssociatedRemote::' - 'BindNewEndpointAndPassDedicatedReceiver() instead.', - ), - ), - ( - r'/\bmojo::MakeStrongBinding\b', - ( - 'mojo::MakeStrongBinding is deprecated.', - 'Either migrate to mojo::UniqueReceiverSet, if possible, or use', - 'mojo::MakeSelfOwnedReceiver() instead.', - ), - ), - ( - r'/\bmojo::MakeStrongAssociatedBinding\b', - ( - 'mojo::MakeStrongAssociatedBinding is deprecated.', - 'Either migrate to mojo::UniqueAssociatedReceiverSet, if possible, or', - 'use mojo::MakeSelfOwnedAssociatedReceiver() instead.', - ), - ), - ( - r'/\bmojo::StrongAssociatedBinding\b', - ( - 'mojo::StrongAssociatedBinding is deprecated.', - 'Use mojo::MakeSelfOwnedAssociatedReceiver instead.', - ), - ), - ( - r'/\bmojo::StrongBinding\b', - ( - 'mojo::StrongBinding is deprecated.', - 'Use mojo::MakeSelfOwnedReceiver instead.', - ), - ), - ( - r'/\bmojo::StrongAssociatedBindingSet\b', - ( - 'mojo::StrongAssociatedBindingSet is deprecated.', - 'Use mojo::UniqueAssociatedReceiverSet instead.', - ), - ), - ( - r'/\bmojo::StrongBindingSet\b', - ( - 'mojo::StrongBindingSet is deprecated.', - 'Use mojo::UniqueReceiverSet instead.', - ), - ), ) _IPC_ENUM_TRAITS_DEPRECATED = ( diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py index b490d2a8f11ce4..50a7d145e03be3 100755 --- a/PRESUBMIT_test.py +++ b/PRESUBMIT_test.py @@ -2353,18 +2353,6 @@ def testDeprecatedMojoTypes(self): warning_paths = ['some/cpp'] error_paths = ['third_party/blink', 'content'] test_cases = [ - { - 'type': 'mojo::AssociatedBinding<>;', - 'file': 'file1.c' - }, - { - 'type': 'mojo::AssociatedBindingSet<>;', - 'file': 'file2.c' - }, - { - 'type': 'mojo::AssociatedInterfacePtr<>', - 'file': 'file3.cc' - }, { 'type': 'mojo::AssociatedInterfacePtrInfo<>', 'file': 'file4.cc' @@ -2373,14 +2361,6 @@ def testDeprecatedMojoTypes(self): 'type': 'mojo::AssociatedInterfaceRequest<>', 'file': 'file5.cc' }, - { - 'type': 'mojo::Binding<>', - 'file': 'file6.cc' - }, - { - 'type': 'mojo::BindingSet<>', - 'file': 'file7.cc' - }, { 'type': 'mojo::InterfacePtr<>', 'file': 'file8.cc' @@ -2397,34 +2377,6 @@ def testDeprecatedMojoTypes(self): 'type': 'mojo::MakeRequest()', 'file': 'file11.cc' }, - { - 'type': 'mojo::MakeRequestAssociatedWithDedicatedPipe()', - 'file': 'file12.cc' - }, - { - 'type': 'mojo::MakeStrongBinding()<>', - 'file': 'file13.cc' - }, - { - 'type': 'mojo::MakeStrongAssociatedBinding()<>', - 'file': 'file14.cc' - }, - { - 'type': 'mojo::StrongAssociatedBinding<>', - 'file': 'file15.cc' - }, - { - 'type': 'mojo::StrongBinding<>', - 'file': 'file16.cc' - }, - { - 'type': 'mojo::StrongAssociatedBindingSet<>', - 'file': 'file17.cc' - }, - { - 'type': 'mojo::StrongBindingSet<>', - 'file': 'file18.cc' - }, ] # Build the list of MockFiles considering paths that should trigger warnings