From 2220bd6553b4aae764ed66b24f5aa6e398c70b68 Mon Sep 17 00:00:00 2001 From: bnc Date: Mon, 9 Mar 2015 13:47:44 -0700 Subject: Revert of base: Fix/add header #ifndef guards. (patchset #2 id:20001 of https://codereview.chromium.org/985003004/) Reason for revert: This seems to be causing tree closing compile failure https://build.chromium.org/p/chromium/builders/Android/builds/36135/steps/compile/logs/stdio. Original issue's description: > base: Fix/add header #ifndef guards. > > Header guards should be defined based on the path and file name of the > header file. Some headers have it wrong, some are missing the guards, > and some just have the matching comment wrong. > > R=Nico > BUG=464816 > > Committed: https://crrev.com/301b392761fd8f66f3a701ab1dd011c6e7a55e19 > Cr-Commit-Position: refs/heads/master@{#319722} TBR=thakis@chromium.org,danakj@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=464816 Review URL: https://codereview.chromium.org/989343002 Cr-Commit-Position: refs/heads/master@{#319728} --- base/trace_event/trace_event.h | 2 +- base/trace_event/trace_event_synthetic_delay.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'base/trace_event') diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h index b90a3ea..c30a84a 100644 --- a/base/trace_event/trace_event.h +++ b/base/trace_event/trace_event.h @@ -1607,4 +1607,4 @@ template class TraceScopedTrackableObject { } // namespace trace_event } // namespace base -#endif // BASE_TRACE_EVENT_TRACE_EVENT_H_ +#endif /* BASE_TRACE_EVENT_TRACE_EVENT_H_ */ diff --git a/base/trace_event/trace_event_synthetic_delay.h b/base/trace_event/trace_event_synthetic_delay.h index 0df794b..14801be 100644 --- a/base/trace_event/trace_event_synthetic_delay.h +++ b/base/trace_event/trace_event_synthetic_delay.h @@ -163,4 +163,4 @@ TRACE_EVENT_API_CLASS_EXPORT base::trace_event::TraceEventSyntheticDelay* } // namespace trace_event_internal -#endif // BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_ +#endif /* BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_ */ -- cgit v1.1