| Index: cc/output/begin_frame_args.h
|
| diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h
|
| index 47430ca9f2963dc15318a65de722d4c39c0e52d0..10f7f28aa346f1e1ad99cd23e8986d95f3921de5 100644
|
| --- a/cc/output/begin_frame_args.h
|
| +++ b/cc/output/begin_frame_args.h
|
| @@ -16,14 +16,7 @@ namespace trace_event {
|
| class ConvertableToTraceFormat;
|
| class TracedValue;
|
| }
|
| -
|
| -// TODO(ssid): remove these aliases after the tracing clients are moved to the
|
| -// new trace_event namespace. See crbug.com/451032. ETA: March 2015
|
| -namespace debug {
|
| -using ::base::trace_event::ConvertableToTraceFormat;
|
| -using ::base::trace_event::TracedValue;
|
| }
|
| -} // namespace base
|
|
|
| /**
|
| * In debug builds we trace the creation origin of BeginFrameArgs objects. We
|
| @@ -84,8 +77,8 @@ struct CC_EXPORT BeginFrameArgs {
|
|
|
| bool IsValid() const { return interval >= base::TimeDelta(); }
|
|
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
|
| - void AsValueInto(base::debug::TracedValue* dict) const;
|
| + scoped_refptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
|
| + void AsValueInto(base::trace_event::TracedValue* dict) const;
|
|
|
| base::TimeTicks frame_time;
|
| base::TimeTicks deadline;
|
|
|