[Doodle] Pull time_to_live out of DoodleConfig

components/doodle/doodle_service_unittest.cc

Index: components/doodle/doodle_service_unittest.cc
diff --git a/components/doodle/doodle_service_unittest.cc b/components/doodle/doodle_service_unittest.cc
index 48b3a10cadeeb64fa908792b8d552c5faff564ef..3f6b09c71fe7e4f8779f96b04db603125d7bcd46 100644
--- a/components/doodle/doodle_service_unittest.cc
+++ b/components/doodle/doodle_service_unittest.cc
@@ -10,6 +10,7 @@
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
+#include "base/time/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -32,9 +33,10 @@ class FakeDoodleFetcher : public DoodleFetcher {
   size_t num_pending_callbacks() const { return callbacks_.size(); }
 
   void ServeAllCallbacks(DoodleState state,
+                         base::TimeDelta time_to_live,
                          const base::Optional<DoodleConfig>& config) {
     for (auto& callback : callbacks_) {
-      std::move(callback).Run(state, config);
+      std::move(callback).Run(state, time_to_live, config);
     }
     callbacks_.clear();
   }
@@ -51,12 +53,6 @@ class MockDoodleObserver : public DoodleService::Observer {
 
 }  // namespace
 
-// Equality operator for DoodleConfigs, for use by testing::Eq.
-// Note: This must be outside of the anonymous namespace.
-bool operator==(const DoodleConfig& lhs, const DoodleConfig& rhs) {
-  return lhs.IsEquivalent(rhs);
-}
-
 class DoodleServiceTest : public testing::Test {
  public:
   DoodleServiceTest() : fetcher_(nullptr) {
@@ -68,6 +64,8 @@ class DoodleServiceTest : public testing::Test {
   DoodleService* service() { return service_.get(); }
   FakeDoodleFetcher* fetcher() { return fetcher_; }
 
+  base::TimeDelta some_time() const { return base::TimeDelta::FromHours(1); }

[mastiz, 2017/03/02 19:55:42]

Use a constant instead, kSomeTime?

[fhorschig, 2017/03/02 20:18:56]

Has const base::TimeDelta and exit-time destructor?
Otherwise, you could make it an implementation detail
named |AnHour()| ... I just looked at your follow-up
and you might save some work here or there.

[Marc Treib, 2017/03/03 09:35:26]

Constants of non-trivial types are mostly disallowed, because we don't like
static initializers.

I've just inlined it below, since the helper really doesn't save much anyway.

[Marc Treib, 2017/03/03 09:35:26]

...I don't follow?

[mastiz, 2017/03/03 11:17:44]

Right, the solution is to not make it static. Simply a public (or protected)
variable that is const or constexpr.

+
  private:
   std::unique_ptr<DoodleService> service_;
   FakeDoodleFetcher* fetcher_;
@@ -84,7 +82,7 @@ TEST_F(DoodleServiceTest, FetchesConfigOnRefresh) {
   // Serve it (with an arbitrary config).
   DoodleConfig config;
   config.doodle_type = DoodleType::SIMPLE;
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(), config);
 
   // The config should be available.
   EXPECT_THAT(service()->config(), Eq(config));
@@ -97,8 +95,9 @@ TEST_F(DoodleServiceTest, FetchesConfigOnRefresh) {
   // Serve it with a different config.
   DoodleConfig other_config;
   other_config.doodle_type = DoodleType::SLIDESHOW;
-  DCHECK(!config.IsEquivalent(other_config));
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, other_config);
+  DCHECK(config != other_config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(),
+                               other_config);
 
   // The config should have been updated.
   EXPECT_THAT(service()->config(), Eq(other_config));
@@ -119,7 +118,7 @@ TEST_F(DoodleServiceTest, CallsObserverOnConfigReceived) {
   DoodleConfig config;
   config.doodle_type = DoodleType::SIMPLE;
   EXPECT_CALL(observer, OnDoodleConfigUpdated(Eq(config)));
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(), config);
 
   // Remove the observer before the service gets destroyed.
   service()->RemoveObserver(&observer);
@@ -130,7 +129,7 @@ TEST_F(DoodleServiceTest, CallsObserverOnConfigRemoved) {
   service()->Refresh();
   DoodleConfig config;
   config.doodle_type = DoodleType::SIMPLE;
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(), config);
   ASSERT_THAT(service()->config(), Eq(config));
 
   // Register an observer and request a refresh.
@@ -142,7 +141,8 @@ TEST_F(DoodleServiceTest, CallsObserverOnConfigRemoved) {
   // Serve the request with an empty doodle config. The observer should get
   // notified.
   EXPECT_CALL(observer, OnDoodleConfigUpdated(Eq(base::nullopt)));
-  fetcher()->ServeAllCallbacks(DoodleState::NO_DOODLE, base::nullopt);
+  fetcher()->ServeAllCallbacks(DoodleState::NO_DOODLE, base::TimeDelta(),
+                               base::nullopt);
 
   // Remove the observer before the service gets destroyed.
   service()->RemoveObserver(&observer);
@@ -153,7 +153,7 @@ TEST_F(DoodleServiceTest, CallsObserverOnConfigUpdated) {
   service()->Refresh();
   DoodleConfig config;
   config.doodle_type = DoodleType::SIMPLE;
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(), config);
   ASSERT_THAT(service()->config(), Eq(config));
 
   // Register an observer and request a refresh.
@@ -166,9 +166,10 @@ TEST_F(DoodleServiceTest, CallsObserverOnConfigUpdated) {
   // notified.
   DoodleConfig other_config;
   other_config.doodle_type = DoodleType::SLIDESHOW;
-  DCHECK(!config.IsEquivalent(other_config));
+  DCHECK(config != other_config);
   EXPECT_CALL(observer, OnDoodleConfigUpdated(Eq(other_config)));
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, other_config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(),
+                               other_config);
 
   // Remove the observer before the service gets destroyed.
   service()->RemoveObserver(&observer);
@@ -179,7 +180,7 @@ TEST_F(DoodleServiceTest, DoesNotCallObserverWhenConfigEquivalent) {
   service()->Refresh();
   DoodleConfig config;
   config.doodle_type = DoodleType::SIMPLE;
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(), config);
   ASSERT_THAT(service()->config(), Eq(config));
 
   // Register an observer and request a refresh.
@@ -192,8 +193,9 @@ TEST_F(DoodleServiceTest, DoesNotCallObserverWhenConfigEquivalent) {
   // *not* get notified.
   DoodleConfig equivalent_config;
   equivalent_config.doodle_type = DoodleType::SIMPLE;
-  DCHECK(config.IsEquivalent(equivalent_config));
-  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, equivalent_config);
+  DCHECK(config == equivalent_config);
+  fetcher()->ServeAllCallbacks(DoodleState::AVAILABLE, some_time(),
+                               equivalent_config);
 
   // Remove the observer before the service gets destroyed.
   service()->RemoveObserver(&observer);