Added last_modified field to TemplateURL and database. Updated unit tests, including refactoring MockTimeProvider out of media/.

BUG=None
TEST=No visible changes. Ensure that changed unittests all pass.
Review URL: http://codereview.chromium.org/7232023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90764 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 19 insertions, 46 deletions

diff --git a/media/base/clock_unittest.cc b/media/base/clock_unittest.cc
index 1fe7416..dcf39ae 100644
--- a/media/base/clock_unittest.cc
+++ b/media/base/clock_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "base/test/mock_time_provider.h"
 #include "media/base/clock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-using ::testing::DefaultValue;
 using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::StrictMock;
@@ -24,44 +24,17 @@ static std::ostream& operator<<(std::ostream& stream, const TimeDelta& time) {
 
 namespace media {
 
-class MockTimeProvider {
- public:
-  MockTimeProvider() {
-    DCHECK(!instance_) << "Only one instance of MockTimeProvider can exist";
-    DCHECK(!DefaultValue<base::Time>::IsSet());
-    instance_ = this;
-    DefaultValue<base::Time>::Set(base::Time::FromInternalValue(0));
-  }
-
-  ~MockTimeProvider() {
-    instance_ = NULL;
-    DefaultValue<base::Time>::Clear();
-  }
-
-  MOCK_METHOD0(Now, base::Time());
-
-  static base::Time StaticNow() {
-    return instance_->Now();
-  }
-
- private:
-  static MockTimeProvider* instance_;
-  DISALLOW_COPY_AND_ASSIGN(MockTimeProvider);
-};
-
-MockTimeProvider* MockTimeProvider::instance_ = NULL;
-
 TEST(ClockTest, Created) {
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   const base::TimeDelta kExpected = base::TimeDelta::FromSeconds(0);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   EXPECT_EQ(kExpected, clock.Elapsed());
 }
 
 TEST(ClockTest, Play_NormalSpeed) {
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -69,14 +42,14 @@ TEST(ClockTest, Play_NormalSpeed) {
   const base::TimeDelta kZero;
   const base::TimeDelta kExpected = base::TimeDelta::FromSeconds(2);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   EXPECT_EQ(kZero, clock.Play());
   EXPECT_EQ(kExpected, clock.Elapsed());
 }
 
 TEST(ClockTest, Play_DoubleSpeed) {
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -84,7 +57,7 @@ TEST(ClockTest, Play_DoubleSpeed) {
   const base::TimeDelta kZero;
   const base::TimeDelta kExpected = base::TimeDelta::FromSeconds(10);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   clock.SetPlaybackRate(2.0f);
   EXPECT_EQ(kZero, clock.Play());
   EXPECT_EQ(kExpected, clock.Elapsed());
@@ -92,7 +65,7 @@ TEST(ClockTest, Play_DoubleSpeed) {
 
 TEST(ClockTest, Play_HalfSpeed) {
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -100,7 +73,7 @@ TEST(ClockTest, Play_HalfSpeed) {
   const base::TimeDelta kZero;
   const base::TimeDelta kExpected = base::TimeDelta::FromSeconds(2);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   clock.SetPlaybackRate(0.5f);
   EXPECT_EQ(kZero, clock.Play());
   EXPECT_EQ(kExpected, clock.Elapsed());
@@ -111,7 +84,7 @@ TEST(ClockTest, Play_ZeroSpeed) {
   // seconds at normal speed:
   //   (1.0 x 2) + (0.0 x 4) + (1.0 x 8) = 10
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -123,7 +96,7 @@ TEST(ClockTest, Play_ZeroSpeed) {
   const base::TimeDelta kZero;
   const base::TimeDelta kExpected = base::TimeDelta::FromSeconds(10);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   EXPECT_EQ(kZero, clock.Play());
   clock.SetPlaybackRate(0.0f);
   clock.SetPlaybackRate(1.0f);
@@ -135,7 +108,7 @@ TEST(ClockTest, Play_MultiSpeed) {
   // seconds at double speed:
   //   (0.5 x 2) + (1.0 x 4) + (2.0 x 8) = 21
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -147,7 +120,7 @@ TEST(ClockTest, Play_MultiSpeed) {
   const base::TimeDelta kZero;
   const base::TimeDelta kExpected = base::TimeDelta::FromSeconds(21);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   clock.SetPlaybackRate(0.5f);
   EXPECT_EQ(kZero, clock.Play());
   clock.SetPlaybackRate(1.0f);
@@ -157,7 +130,7 @@ TEST(ClockTest, Play_MultiSpeed) {
 
 TEST(ClockTest, Pause) {
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -170,7 +143,7 @@ TEST(ClockTest, Pause) {
   const base::TimeDelta kFirstPause = base::TimeDelta::FromSeconds(4);
   const base::TimeDelta kSecondPause = base::TimeDelta::FromSeconds(8);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   EXPECT_EQ(kZero, clock.Play());
   EXPECT_EQ(kFirstPause, clock.Pause());
   EXPECT_EQ(kFirstPause, clock.Elapsed());
@@ -183,11 +156,11 @@ TEST(ClockTest, SetTime_Paused) {
   // We'll remain paused while we set the time.  The time should be simply
   // updated without accessing the time provider.
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   const base::TimeDelta kFirstTime = base::TimeDelta::FromSeconds(4);
   const base::TimeDelta kSecondTime = base::TimeDelta::FromSeconds(16);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   clock.SetTime(kFirstTime);
   EXPECT_EQ(kFirstTime, clock.Elapsed());
   clock.SetTime(kSecondTime);
@@ -198,7 +171,7 @@ TEST(ClockTest, SetTime_Playing) {
   // We'll play for 4 seconds, then set the time to 12, then play for 4 more
   // seconds.  We'll expect a media time of 16.
   InSequence s;
-  StrictMock<MockTimeProvider> mock_time;
+  StrictMock<base::MockTimeProvider> mock_time;
   EXPECT_CALL(mock_time, Now())
       .WillOnce(Return(base::Time::FromDoubleT(4)));
   EXPECT_CALL(mock_time, Now())
@@ -208,7 +181,7 @@ TEST(ClockTest, SetTime_Playing) {
   const base::TimeDelta kZero;
   const base::TimeDelta kExepected = base::TimeDelta::FromSeconds(16);
 
-  Clock clock(&MockTimeProvider::StaticNow);
+  Clock clock(&base::MockTimeProvider::StaticNow);
   EXPECT_EQ(kZero, clock.Play());
   clock.SetTime(base::TimeDelta::FromSeconds(12));
   EXPECT_EQ(kExepected, clock.Elapsed());