diff --git a/ipc/chromium/src/base/time.h b/ipc/chromium/src/base/time.h index 292587083d20..4d5352dad7ff 100644 --- a/ipc/chromium/src/base/time.h +++ b/ipc/chromium/src/base/time.h @@ -28,12 +28,6 @@ #include "base/basictypes.h" -#if defined(OS_WIN) -// For FILETIME in FromFileTime, until it moves to a new converter class. -// See TODO(iyengar) below. -#include -#endif - namespace base { class Time; @@ -199,11 +193,6 @@ class Time { static Time FromDoubleT(double dt); double ToDoubleT() const; -#if defined(OS_WIN) - static Time FromFileTime(FILETIME ft); - FILETIME ToFileTime() const; -#endif - // Converts an exploded structure representing either the local time or UTC // into a Time class. static Time FromUTCExploded(const Exploded& exploded) { @@ -391,11 +380,6 @@ class TimeTicks { // Tick count in microseconds. int64_t ticks_; - -#if defined(OS_WIN) - typedef DWORD (*TickFunctionType)(void); - static TickFunctionType SetMockTickFunction(TickFunctionType ticker); -#endif }; inline TimeTicks TimeDelta::operator+(TimeTicks t) const { diff --git a/ipc/chromium/src/base/time_win.cc b/ipc/chromium/src/base/time_win.cc index 9312092bb2d2..4bc2135235bb 100644 --- a/ipc/chromium/src/base/time_win.cc +++ b/ipc/chromium/src/base/time_win.cc @@ -138,17 +138,6 @@ Time Time::NowFromSystemTime() { return Time(initial_time); } -// static -Time Time::FromFileTime(FILETIME ft) { - return Time(FileTimeToMicroseconds(ft)); -} - -FILETIME Time::ToFileTime() const { - FILETIME utc_ft; - MicrosecondsToFileTime(us_, &utc_ft); - return utc_ft; -} - // static Time Time::FromExploded(bool is_local, const Exploded& exploded) { // Create the system struct representing our exploded time. It will either be @@ -256,14 +245,6 @@ class NowSingleton { } // namespace -// static -TimeTicks::TickFunctionType TimeTicks::SetMockTickFunction( - TickFunctionType ticker) { - TickFunctionType old = tick_function; - tick_function = ticker; - return old; -} - // static TimeTicks TimeTicks::Now() { return TimeTicks() + NowSingleton::instance().Now();