| Index: cc/stubs/TraceEvent.h
|
| diff --git a/cc/stubs/TraceEvent.h b/cc/stubs/TraceEvent.h
|
| index 75587a34a178de7cb36e66331de0421a10dec76d..27e408934c5f13779b5322a340f6c64cca35d28a 100644
|
| --- a/cc/stubs/TraceEvent.h
|
| +++ b/cc/stubs/TraceEvent.h
|
| @@ -1,10 +1,6 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// Chromium's LOG() macro collides with one from WTF.
|
| -#ifdef LOG
|
| -#undef LOG
|
| -#endif
|
| -
|
| -#include "base/debug/trace_event.h"
|
| +// Temporary forwarding header
|
| +#include "cc/stubs/trace_event.h"
|
|
|