Revert of Fixit: Factor out common base::Time* math operator overloads. (patchset #2 id:40001 of https://codereview.chromium.org/1122443004/)

Reason for revert:
Broke iOS build.

http://build.chromium.org/p/chromium.mac/builders/iOS_Device/builds/5621/steps/compile/logs/stdio

Original issue's description:
> Fixit: Factor out common base::Time* math operator overloads.
>
> This is part 1 of a 2-part change to fork base::TimeTicks into three
> type-checked time classes (TimeTicks + ThreadTicks + TraceTicks).  The
> forking of TimeTicks will ensure values from different clocks are not
> erroneously being mixed together when doing time math.
>
> In this change, the identical comparison and math operator overloads
> found in base::Time and base::TimeTicks are being factored-out into a
> templated base class.  In a following change, this base class will also
> be used to de-dupe this common functionality in the two new time
> classes.
>
> BUG=467417
>
> Committed: https://crrev.com/7ca717095b4758cb76e53e904b775852e46d646d
> Cr-Commit-Position: refs/heads/master@{#328696}

TBR=thestig@chromium.org,miu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=467417

Review URL: https://codereview.chromium.org/1130953002

Cr-Commit-Position: refs/heads/master@{#328706}

1 files changed, 2 insertions, 2 deletions

diff --git a/base/time/time_unittest.cc b/base/time/time_unittest.cc
index 456782c..6c12423 100644
--- a/base/time/time_unittest.cc
+++ b/base/time/time_unittest.cc
@@ -717,7 +717,7 @@ TEST(TimeTicks, NowFromSystemTraceTime) {
 
 TEST(TimeTicks, SnappedToNextTickBasic) {
   base::TimeTicks phase = base::TimeTicks::FromInternalValue(4000);
-  base::TimeDelta interval = base::TimeDelta::FromMicroseconds(1000);
+  base::TimeDelta interval = base::TimeDelta::FromInternalValue(1000);
   base::TimeTicks timestamp;
 
   // Timestamp in previous interval.
@@ -760,7 +760,7 @@ TEST(TimeTicks, SnappedToNextTickOverflow) {
   // int(big_timestamp / interval) < 0, so this causes a crash if the number of
   // intervals elapsed is attempted to be stored in an int.
   base::TimeTicks phase = base::TimeTicks::FromInternalValue(0);
-  base::TimeDelta interval = base::TimeDelta::FromMicroseconds(4000);
+  base::TimeDelta interval = base::TimeDelta::FromInternalValue(4000);
   base::TimeTicks big_timestamp =
       base::TimeTicks::FromInternalValue(8635916564000);