Skip to content

Commit

Permalink
Remove some presubmit checks for deprecated Mojo types.
Browse files Browse the repository at this point in the history 
The Mojo types being checked for are gone.

Change-Id: If47df6eee609508dd23385e2ffc444c652fa5775
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2908718
Auto-Submit: Lei Zhang <thestig@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#885247}
  • Loading branch information
@leizleiz
leizleiz authored and Chromium LUCI CQ committed May 20, 2021
1 parent 6665574 commit ed37780
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 135 deletions.
87 changes: 0 additions & 87 deletions PRESUBMIT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<Interface> is deprecated.',
'Use mojo::AssociatedReceiver<Interface> instead.',
),
),
(
r'/\bmojo::AssociatedBindingSet\b',
(
'mojo::AssociatedBindingSet<Interface> is deprecated.',
'Use mojo::AssociatedReceiverSet<Interface> instead.',
),
),
(
r'/\bmojo::AssociatedInterfacePtr\b',
(
'mojo::AssociatedInterfacePtr<Interface> is deprecated.',
'Use mojo::AssociatedRemote<Interface> instead.',
),
),
(
r'/\bmojo::AssociatedInterfacePtrInfo\b',
(
Expand All @@ -1010,20 +989,6 @@
'Use mojo::PendingAssociatedReceiver<Interface> instead.',
),
),
(
r'/\bmojo::Binding\b',
(
'mojo::Binding<Interface> is deprecated.',
'Use mojo::Receiver<Interface> instead.',
),
),
(
r'/\bmojo::BindingSet\b',
(
'mojo::BindingSet<Interface> is deprecated.',
'Use mojo::ReceiverSet<Interface> instead.',
),
),
(
r'/\bmojo::InterfacePtr\b',
(
Expand Down Expand Up @@ -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<Interface> is deprecated.',
'Use mojo::MakeSelfOwnedAssociatedReceiver<Interface> instead.',
),
),
(
r'/\bmojo::StrongBinding\b',
(
'mojo::StrongBinding<Interface> is deprecated.',
'Use mojo::MakeSelfOwnedReceiver<Interface> instead.',
),
),
(
r'/\bmojo::StrongAssociatedBindingSet\b',
(
'mojo::StrongAssociatedBindingSet<Interface> is deprecated.',
'Use mojo::UniqueAssociatedReceiverSet<Interface> instead.',
),
),
(
r'/\bmojo::StrongBindingSet\b',
(
'mojo::StrongBindingSet<Interface> is deprecated.',
'Use mojo::UniqueReceiverSet<Interface> instead.',
),
),
)

_IPC_ENUM_TRAITS_DEPRECATED = (
Expand Down
48 changes: 0 additions & 48 deletions PRESUBMIT_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand Down

0 comments on commit ed37780

Please sign in to comment.