| Index: base/timer/elapsed_timer.h
|
| diff --git a/base/timer/elapsed_timer.h b/base/timer/elapsed_timer.h
|
| index 1cb9f1193d8e918299692987430e2dd1ab8474c6..592858a6e50d225967be99d46940467debad8bf6 100644
|
| --- a/base/timer/elapsed_timer.h
|
| +++ b/base/timer/elapsed_timer.h
|
| @@ -6,7 +6,7 @@
|
| #define BASE_TIMER_ELAPSED_TIMER_H_
|
|
|
| #include "base/base_export.h"
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/time/time.h"
|
|
|
| namespace base {
|
| @@ -15,10 +15,9 @@ namespace base {
|
| class BASE_EXPORT ElapsedTimer {
|
| public:
|
| ElapsedTimer();
|
| - virtual ~ElapsedTimer() {}
|
|
|
| // Returns the time elapsed since object construction.
|
| - virtual TimeDelta Elapsed() const;
|
| + TimeDelta Elapsed() const;
|
|
|
| private:
|
| TimeTicks begin_;
|
|
|