Avoid base::Time::FromJavaTime() when not dealing with Java.

chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc

 // Copyright 2016 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 "chrome/browser/ntp_snippets/download_suggestions_provider.h"
 
 #include <memory>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time/default_clock.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/mock_content_suggestions_provider_observer.h"
 #include "components/ntp_snippets/offline_pages/offline_pages_test_utils.h"
@@ skipping 64 matching lines @@
   }
   return os;
 }
 
 }  // namespace ntp_snippets
 
 namespace {
 
 const int kDefaultMaxDownloadAgeHours = 6 * 7 * 24;
 
-// Tue, 31 Jan 2017 13:00:00 UTC
-const base::Time now = base::Time::FromJavaTime(1485867600000);
+base::Time GetDummyNowTime() {

[vitaliii, 2017/05/19 07:09:07]

How about

== CODE STARTS ==
base::Time GetTimeFromUTCString(const std::string& time_string) {
  base::Time result;
  CHECK(base::Time::FromUTCString(time_string, &result));
  return result;
}

const base::Time now = GetTimeFromUTCString("2017-01-31 13:00:00")
== CODE ENDS ==

I do not like that GetDummy(Not)?OutdatedTime() adds a level of indirection.

+  static base::Time now;
+  static bool now_set = false;
+  if (!now_set) {
+    CHECK(base::Time::FromUTCString("2017-01-31 13:00:00", &now));
+    now_set = true;
+  }
+  return now;
+}
+
+base::Time GetDummyNotOutdatedTime() {
+  return GetDummyNowTime() -
+         base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) +
+         base::TimeDelta::FromSeconds(1);
+}
+
+base::Time GetDummyOutdatedTime() {
+  return GetDummyNowTime() -
+         base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) -
+         base::TimeDelta::FromSeconds(1);
+}
 
 // TODO(vitaliii): Move this and outputting functions above to common file and
 // replace remaining |Property(&ContentSuggestion::url, GURL("some_url"))|.
 // See crbug.com/655513.
 MATCHER_P(HasUrl, url, "") {
   *result_listener << "expected URL: " << url
                    << "has URL: " << arg.url().spec();
   return arg.url().spec() == url;
 }
 
@@ skipping 360 matching lines @@
   FireDownloadCreated(asset_downloads[1].get());
 }
 
 TEST_F(DownloadSuggestionsProviderTest, ShouldSortSuggestions) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
 
   std::vector<OfflinePageItem> offline_pages = CreateDummyOfflinePages({0, 1});
 
   offline_pages[0].url = GURL("http://dummy.com/0");
-  offline_pages[0].creation_time = now - base::TimeDelta::FromMinutes(10);
+  offline_pages[0].creation_time =
+      GetDummyNowTime() - base::TimeDelta::FromMinutes(10);
   offline_pages[0].last_access_time = offline_pages[0].creation_time;
 
   offline_pages[1].url = GURL("http://dummy.com/1");
-  offline_pages[1].creation_time = now - base::TimeDelta::FromMinutes(5);
+  offline_pages[1].creation_time =
+      GetDummyNowTime() - base::TimeDelta::FromMinutes(5);
   offline_pages[1].last_access_time = offline_pages[1].creation_time;
 
   *(offline_pages_model()->mutable_items()) = offline_pages;
 
   auto test_clock = base::MakeUnique<base::SimpleTestClock>();
-  test_clock->SetNow(now);
+  test_clock->SetNow(GetDummyNowTime());
   EXPECT_CALL(*observer(),
               OnNewSuggestions(_, downloads_category(),
                                ElementsAre(HasUrl("http://dummy.com/1"),
                                            HasUrl("http://dummy.com/0"))));
   CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/true,
                        std::move(test_clock));
 
   std::vector<std::unique_ptr<FakeDownloadItem>> asset_downloads =
       CreateDummyAssetDownloads({2, 3});
 
   asset_downloads[0]->SetURL(GURL("http://download.com/2"));
-  asset_downloads[0]->SetStartTime(now - base::TimeDelta::FromMinutes(3));
+  asset_downloads[0]->SetStartTime(GetDummyNowTime() -
+                                   base::TimeDelta::FromMinutes(3));
 
   asset_downloads[1]->SetURL(GURL("http://download.com/3"));
-  asset_downloads[1]->SetStartTime(now - base::TimeDelta::FromMinutes(7));
+  asset_downloads[1]->SetStartTime(GetDummyNowTime() -
+                                   base::TimeDelta::FromMinutes(7));
 
   EXPECT_CALL(*observer(),
               OnNewSuggestions(_, downloads_category(),
                                ElementsAre(HasUrl("http://download.com/2"),
                                            HasUrl("http://dummy.com/1"),
                                            HasUrl("http://dummy.com/0"))));
   FireDownloadCreated(asset_downloads[0].get());
 
   EXPECT_CALL(*observer(),
               OnNewSuggestions(_, downloads_category(),
@@ skipping 518 matching lines @@
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1});
   // Once the manager has been loaded, the ids should be pruned.
   EXPECT_THAT(GetDismissedSuggestions(), IsEmpty());
 }
 
 TEST_F(DownloadSuggestionsProviderTest, ShouldNotShowOutdatedDownloads) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
 
-  const base::Time not_outdated =
-      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) +
-      base::TimeDelta::FromSeconds(1);
-  const base::Time outdated =
-      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) -
-      base::TimeDelta::FromSeconds(1);
+  const base::Time not_outdated = GetDummyNotOutdatedTime();
+  const base::Time outdated = GetDummyOutdatedTime();
 
   *(offline_pages_model()->mutable_items()) = CreateDummyOfflinePages({0, 1});
 
   offline_pages_model()->mutable_items()->at(0).url =
       GURL("http://dummy.com/0");
   offline_pages_model()->mutable_items()->at(0).creation_time = not_outdated;
   offline_pages_model()->mutable_items()->at(0).last_access_time = not_outdated;
 
   offline_pages_model()->mutable_items()->at(1).url =
       GURL("http://dummy.com/1");
   offline_pages_model()->mutable_items()->at(1).creation_time = outdated;
   offline_pages_model()->mutable_items()->at(1).last_access_time = outdated;
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({0, 1});
 
   downloads_manager()->mutable_items()->at(0)->SetURL(
       GURL("http://download.com/0"));
   downloads_manager()->mutable_items()->at(0)->SetStartTime(not_outdated);
 
   downloads_manager()->mutable_items()->at(1)->SetURL(
       GURL("http://download.com/1"));
   downloads_manager()->mutable_items()->at(1)->SetStartTime(outdated);
 
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
                        UnorderedElementsAre(HasUrl("http://dummy.com/0"),
                                             HasUrl("http://download.com/0"))));
   auto test_clock = base::MakeUnique<base::SimpleTestClock>();
-  test_clock->SetNow(now);
+  test_clock->SetNow(GetDummyNowTime());
   CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/true,
                        std::move(test_clock));
 }
 
 TEST_F(DownloadSuggestionsProviderTest,
        ShouldShowRecentlyVisitedOfflinePageDownloads) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
 
-  const base::Time not_outdated =
-      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) +
-      base::TimeDelta::FromSeconds(1);
-  const base::Time outdated =
-      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) -
-      base::TimeDelta::FromSeconds(1);
+  const base::Time not_outdated = GetDummyNotOutdatedTime();
+  const base::Time outdated = GetDummyOutdatedTime();
 
   std::vector<OfflinePageItem> offline_pages = CreateDummyOfflinePages({0, 1});
 
   offline_pages[0].url = GURL("http://dummy.com/0");
   offline_pages[0].creation_time = outdated;
   offline_pages[0].last_access_time = not_outdated;
 
   offline_pages[1].url = GURL("http://dummy.com/1");
   offline_pages[1].creation_time = outdated;
   offline_pages[1].last_access_time = offline_pages[1].creation_time;
 
   *(offline_pages_model()->mutable_items()) = offline_pages;
 
   // Even though page 0 was created long time ago, it should be reported because
   // it has been visited recently.
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
                        UnorderedElementsAre(HasUrl("http://dummy.com/0"))));
   auto test_clock = base::MakeUnique<base::SimpleTestClock>();
-  test_clock->SetNow(now);
+  test_clock->SetNow(GetDummyNowTime());
   CreateProvider(/*show_assets=*/false, /*show_offline_pages=*/true,
                  std::move(test_clock));
 }
 
 TEST_F(DownloadSuggestionsProviderTest,
        ShouldShowRecentlyVisitedAssetDownloads) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
 
-  const base::Time not_outdated =
-      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) +
-      base::TimeDelta::FromSeconds(1);
-  const base::Time outdated =
-      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) -
-      base::TimeDelta::FromSeconds(1);
+  const base::Time not_outdated = GetDummyNotOutdatedTime();
+  const base::Time outdated = GetDummyOutdatedTime();
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({0, 1});
 
   downloads_manager()->mutable_items()->at(0)->SetURL(
       GURL("http://download.com/0"));
   downloads_manager()->mutable_items()->at(0)->SetStartTime(outdated);
   downloads_manager()->mutable_items()->at(0)->SetLastAccessTime(not_outdated);
 
   downloads_manager()->mutable_items()->at(1)->SetURL(
       GURL("http://download.com/1"));
   downloads_manager()->mutable_items()->at(1)->SetStartTime(outdated);
   downloads_manager()->mutable_items()->at(1)->SetLastAccessTime(
       downloads_manager()->mutable_items()->at(1)->GetStartTime());
 
   // Even though asset download 0 was downloaded long time ago, it should be
   // reported because it has been visited recently.
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
                        UnorderedElementsAre(HasUrl("http://download.com/0"))));
   auto test_clock = base::MakeUnique<base::SimpleTestClock>();
-  test_clock->SetNow(now);
+  test_clock->SetNow(GetDummyNowTime());
   CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/false,
                        std::move(test_clock));
 }