Automated g4 rollback of changelist 265958257. *** Reason for rollback *** ABSL is not supported in Chromium. *** Original change description *** LSC: Replace deprecated thread annotations macros. Abseil thread annotation macros are now prefixed by ABSL_. There is no semantic change; this is just a rename. The edits were generated by devtools/cymbal/tools/run_clang_mr_refactor.sh LSC documentation: go/absl-prefixed-thread-annotations-lsc LSC approval http://b/135729553 Tested: TGP Tested: TAP --sample ran all affected tests and none failed http://test/OCL:265862636:BASE:265839422:1566982650751:76646382 *** PiperOrigin-RevId: 266428140 Change-Id: I6ce0481667cde032ea9df2a9f6a0d04357c22856
diff --git a/quic/qbone/bonnet/icmp_reachable.h b/quic/qbone/bonnet/icmp_reachable.h index 324be8b..4b6403e 100644 --- a/quic/qbone/bonnet/icmp_reachable.h +++ b/quic/qbone/bonnet/icmp_reachable.h
@@ -75,10 +75,9 @@ // Initializes this reachability probe. Must be called from within the // |epoll_server|'s thread. - bool Init() ABSL_LOCKS_EXCLUDED(header_lock_) override; + bool Init() LOCKS_EXCLUDED(header_lock_) override; - int64 /* allow-non-std-int */ OnAlarm() - ABSL_LOCKS_EXCLUDED(header_lock_) override; + int64 /* allow-non-std-int */ OnAlarm() LOCKS_EXCLUDED(header_lock_) override; static QuicStringPiece StatusName(Status status); @@ -111,7 +110,7 @@ IcmpReachable* reachable_; }; - bool OnEvent(int fd) ABSL_LOCKS_EXCLUDED(header_lock_); + bool OnEvent(int fd) LOCKS_EXCLUDED(header_lock_); const absl::Duration timeout_; @@ -129,7 +128,7 @@ int recv_fd_; QuicMutex header_lock_; - icmp6_hdr icmp_header_ ABSL_GUARDED_BY(header_lock_){}; + icmp6_hdr icmp_header_ GUARDED_BY(header_lock_){}; absl::Time start_ = absl::InfinitePast(); absl::Time end_ = absl::InfinitePast();