[Doodle] Replace the expiry_date in DoodleConfig by time_to_live

components/doodle/doodle_fetcher_impl_unittest.cc

Index: components/doodle/doodle_fetcher_impl_unittest.cc
diff --git a/components/doodle/doodle_fetcher_impl_unittest.cc b/components/doodle/doodle_fetcher_impl_unittest.cc
index 5ab04de535368efaf37c011ed5423f02b258357d..96c34d451d4b6f093fe4d6b8a8e5add1c2384846 100644
--- a/components/doodle/doodle_fetcher_impl_unittest.cc
+++ b/components/doodle/doodle_fetcher_impl_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "components/google/core/browser/google_switches.h"
 #include "components/google/core/browser/google_url_tracker.h"
@@ -77,13 +76,7 @@ class DoodleFetcherImplTest : public testing::Test {
         doodle_fetcher_(
             new net::TestURLRequestContextGetter(message_loop_.task_runner()),
             &google_url_tracker_,
-            base::Bind(ParseJson)) {
-    // Random difference to ensure that expiry_dates are really relative.
-    auto clock = base::MakeUnique<base::SimpleTestClock>();
-    clock_ = clock.get();
-    clock_->Advance(base::TimeDelta::FromMilliseconds(1123581321));
-    doodle_fetcher_.SetClockForTesting(std::move(clock));
-  }
+            base::Bind(ParseJson)) {}
 
   void RespondWithData(const std::string& data) {
     RespondToFetcherWithData(GetRunningFetcher(), data);
@@ -133,15 +126,10 @@ class DoodleFetcherImplTest : public testing::Test {
 
   GURL GetGoogleBaseURL() { return google_url_tracker_.google_url(); }
 
-  base::Time TimeFromNow(uint64_t milliseconds) {
-    return clock_->Now() + base::TimeDelta::FromMilliseconds(milliseconds);
-  }
-
  private:
   base::MessageLoop message_loop_;
   GURL url_;
   net::TestURLFetcherFactory url_fetcher_factory_;
-  base::SimpleTestClock* clock_;  // Owned by the doodle_fetcher.
   GoogleURLTracker google_url_tracker_;
   DoodleFetcherImpl doodle_fetcher_;
 };
@@ -232,7 +220,8 @@ TEST_F(DoodleFetcherImplTest, ResponseContainsValidBaseInformation) {
   EXPECT_THAT(config.interactive_html,
               Eq("\u003cstyle\u003e\u003c/style\u003e"));
 
-  EXPECT_THAT(config.expiry_date, Eq(TimeFromNow(55000)));
+  EXPECT_THAT(config.time_to_live,
+              Eq(base::TimeDelta::FromMilliseconds(55000)));
 }
 
 TEST_F(DoodleFetcherImplTest, DoodleExpiresWithinThirtyDaysForTooLargeTTL) {
@@ -248,8 +237,9 @@ TEST_F(DoodleFetcherImplTest, DoodleExpiresWithinThirtyDaysForTooLargeTTL) {
 
   EXPECT_THAT(state, Eq(DoodleState::AVAILABLE));
   ASSERT_TRUE(response.has_value());
-  EXPECT_THAT(response.value().expiry_date,
-              Eq(TimeFromNow(30ul * 24 * 60 * 60 * 1000 /* ms */)));  // 30 days
+  EXPECT_THAT(response.value().time_to_live,
+              Eq(base::TimeDelta::FromMilliseconds(30ul * 24 * 60 * 60 *
+                                                   1000)));  // 30 days
 }
 
 TEST_F(DoodleFetcherImplTest, DoodleExpiresNowWithNegativeTTL) {

[fhorschig, 2017/03/01 15:40:52]

Can we change the name to remove the "Now"?
e.g. ShouldExpireImmediatelyWithNegativeTTL

[Marc Treib, 2017/03/02 09:28:02]

Renamed to DoodleExpiresImmediatelyWithNegativeTTL.

(All the other tests use DoesTheThing rather than ShouldDoTheThing. We can
rename them if you want, I honestly don't care one way or the other, but we
ShouldDoThatInASeparateCL :D)

[fhorschig, 2017/03/02 10:35:13]

I like that one and it's not pressing.

(Actually, we have two standards for different cases: 
1.III.A. ShouldBePreferedOverEverything
1.III.B. DoesEmphaziseActions)

@@ -265,7 +255,8 @@ TEST_F(DoodleFetcherImplTest, DoodleExpiresNowWithNegativeTTL) {
 
   EXPECT_THAT(state, Eq(DoodleState::AVAILABLE));
   ASSERT_TRUE(response.has_value());
-  EXPECT_THAT(response.value().expiry_date, Eq(TimeFromNow(0)));
+  EXPECT_THAT(response.value().time_to_live,
+              Eq(base::TimeDelta::FromMilliseconds(0)));
 }
 
 TEST_F(DoodleFetcherImplTest, DoodleExpiresNowWithoutValidTTL) {

[fhorschig, 2017/03/01 15:40:52]

ShouldExpireImmediatelyWithoutValidTTL?

[Marc Treib, 2017/03/02 09:28:02]

DoodleExpiresImmediatelyWithoutValidTTL

@@ -280,7 +271,8 @@ TEST_F(DoodleFetcherImplTest, DoodleExpiresNowWithoutValidTTL) {
 
   EXPECT_THAT(state, Eq(DoodleState::AVAILABLE));
   ASSERT_TRUE(response.has_value());
-  EXPECT_THAT(response.value().expiry_date, Eq(TimeFromNow(0)));
+  EXPECT_THAT(response.value().time_to_live,
+              Eq(base::TimeDelta::FromMilliseconds(0)));
 }
 
 TEST_F(DoodleFetcherImplTest, ReturnsNoDoodleForMissingLargeImageUrl) {