[NTP Snippets] Clean up NTPSnippetsServiceTests

components/ntp_snippets/ntp_snippet.cc

 // Copyright 2015 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 "components/ntp_snippets/ntp_snippet.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 
 namespace {
@@ skipping 38 matching lines @@
     snippet->set_title(title);
   std::string favicon_url;
   if (dict.GetString(kFaviconUrl, &favicon_url))
     snippet->set_favicon_url(GURL(favicon_url));
   std::string salient_image_url;
   if (dict.GetString(kSalientImageUrl, &salient_image_url))
     snippet->set_salient_image_url(GURL(salient_image_url));
   std::string snippet_str;
   if (dict.GetString(kSnippet, &snippet_str))
     snippet->set_snippet(snippet_str);
-  // creationTimestampSec is a uint64, which is stored using strings
+  // The creation and expiry timestamps are uint64s which are stored as strings.
   std::string creation_timestamp_str;
-  if (dict.GetString(kPublishDate, &creation_timestamp_str)) {
-    int64_t creation_timestamp = 0;
-    if (!base::StringToInt64(creation_timestamp_str, &creation_timestamp)) {
-      // Even if there's an error in the conversion, some garbage data may still
-      // be written to the output var, so reset it
-      creation_timestamp = 0;
-    }
-    snippet->set_publish_date(base::Time::UnixEpoch() +
-                              base::TimeDelta::FromSeconds(creation_timestamp));
-  }
+  if (dict.GetString(kPublishDate, &creation_timestamp_str))
+    snippet->set_publish_date(TimeFromJsonString(creation_timestamp_str));
   std::string expiry_timestamp_str;
-  if (dict.GetString(kExpiryDate, &expiry_timestamp_str)) {
-    int64_t expiry_timestamp = 0;
-    if (!base::StringToInt64(expiry_timestamp_str, &expiry_timestamp)) {
-      // Even if there's an error in the conversion, some garbage data may still
-      // be written to the output var, so reset it
-      expiry_timestamp = 0;
-    }
-    snippet->set_expiry_date(base::Time::UnixEpoch() +
-                             base::TimeDelta::FromSeconds(expiry_timestamp));
-  }
+  if (dict.GetString(kExpiryDate, &expiry_timestamp_str))
+    snippet->set_expiry_date(TimeFromJsonString(expiry_timestamp_str));
 
   return snippet;
 }
 
 std::unique_ptr<base::DictionaryValue> NTPSnippet::ToDictionary() const {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
 
   dict->SetString(kUrl, url_.spec());
   if (!site_title_.empty())
     dict->SetString(kSiteTitle, site_title_);
   if (!title_.empty())
     dict->SetString(kTitle, title_);
   if (favicon_url_.is_valid())
     dict->SetString(kFaviconUrl, favicon_url_.spec());
   if (salient_image_url_.is_valid())
     dict->SetString(kSalientImageUrl, salient_image_url_.spec());
   if (!snippet_.empty())
     dict->SetString(kSnippet, snippet_);
-  if (!publish_date_.is_null()) {
-    dict->SetString(kPublishDate,
-                    base::Int64ToString(
-                        (publish_date_ - base::Time::UnixEpoch()).InSeconds()));
-  }
-  if (!expiry_date_.is_null()) {
-    dict->SetString(kExpiryDate,
-                    base::Int64ToString(
-                        (expiry_date_ - base::Time::UnixEpoch()).InSeconds()));
-  }
+  if (!publish_date_.is_null())
+    dict->SetString(kPublishDate, TimeToJsonString(publish_date_));
+  if (!expiry_date_.is_null())
+    dict->SetString(kExpiryDate, TimeToJsonString(expiry_date_));
 
   return dict;
 }
 
+// static
+base::Time NTPSnippet::TimeFromJsonString(const std::string& timestamp_str) {
+  int64_t timestamp;
+  if (!base::StringToInt64(timestamp_str, &timestamp)) {
+    // Even if there's an error in the conversion, some garbage data may still
+    // be written to the output var, so reset it.
+    timestamp = 0;
+  }
+  return base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(timestamp);
+}
+
+// static
+std::string NTPSnippet::TimeToJsonString(const base::Time& time) {
+  return base::Int64ToString((time - base::Time::UnixEpoch()).InSeconds());
+}
+
 }  // namespace ntp_snippets