Revert of Revert of Revert of Fixit: Factor out common base::Time* math operator overloads.

base/time/time_unittest.cc

 // Copyright (c) 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.
 
 #include "base/time/time.h"
 
 #include <time.h>
 
 #include <limits>
 #include <string>
@@ skipping 699 matching lines @@
   }
 }
 
 TEST(TimeTicks, NowFromSystemTraceTime) {
   // Re-use HighRes test for now since clock properties are identical.
   HighResClockTest(&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.
   timestamp = base::TimeTicks::FromInternalValue(3500);
   EXPECT_EQ(4000,
             timestamp.SnappedToNextTick(phase, interval).ToInternalValue());
 
   // Timestamp in next interval.
   timestamp = base::TimeTicks::FromInternalValue(4500);
   EXPECT_EQ(5000,
@@ skipping 22 matching lines @@
   // Timestamp equal to phase.
   timestamp = base::TimeTicks::FromInternalValue(4000);
   EXPECT_EQ(4000,
             timestamp.SnappedToNextTick(phase, interval).ToInternalValue());
 }
 
 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);
 
   EXPECT_EQ(8635916564000,
             big_timestamp.SnappedToNextTick(phase, interval).ToInternalValue());
   EXPECT_EQ(8635916564000,
             big_timestamp.SnappedToNextTick(big_timestamp, interval)
                 .ToInternalValue());
 }
 
@@ skipping 319 matching lines @@
 
 TEST(TimeTicksLogging, DoesNotMakeStreamBad) {
   std::ostringstream oss;
   oss << TimeTicks();
   EXPECT_TRUE(oss.good());
 }
 
 }  // namespace
 
 }  // namespace base