From 10163281cf7acef4ce2c22027b1ce4cd3c8eeb2a Mon Sep 17 00:00:00 2001 From: "asvitkine@chromium.org" Date: Thu, 17 May 2012 21:30:21 +0000 Subject: Minor cleanups to variation_service.cc. - DCHECK(false) -> NOTREACHED() - Extract date conversion to a helper function BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10375055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137739 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/metrics/variations_service.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/chrome/browser/metrics/variations_service.cc b/chrome/browser/metrics/variations_service.cc index 8b9866f..89e39a2 100644 --- a/chrome/browser/metrics/variations_service.cc +++ b/chrome/browser/metrics/variations_service.cc @@ -45,6 +45,11 @@ chrome::VersionInfo::Channel ConvertStudyChannelToVersionChannel( return chrome::VersionInfo::CHANNEL_UNKNOWN; } +// Converts |date_time| in chrome_variations::Study date format to base::Time. +base::Time ConvertStudyDateToBaseTime(int64 date_time) { + return base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(date_time); +} + } // namespace VariationsService::VariationsService() {} @@ -160,7 +165,7 @@ bool VariationsService::CheckStudyVersion(const chrome_variations::Study& study, const std::string& version_string) { const Version current_version(version_string); if (!current_version.IsValid()) { - DCHECK(false); + NOTREACHED(); return false; } @@ -186,18 +191,16 @@ bool VariationsService::CheckStudyVersion(const chrome_variations::Study& study, // static bool VariationsService::CheckStudyDate(const chrome_variations::Study& study, const base::Time& date_time) { - const base::Time epoch = base::Time::UnixEpoch(); - if (study.has_start_date()) { const base::Time start_date = - epoch + base::TimeDelta::FromSeconds(study.start_date()); + ConvertStudyDateToBaseTime(study.start_date()); if (date_time < start_date) return false; } if (study.has_expiry_date()) { const base::Time expiry_date = - epoch + base::TimeDelta::FromSeconds(study.expiry_date()); + ConvertStudyDateToBaseTime(study.expiry_date()); if (date_time >= expiry_date) return false; } @@ -251,9 +254,8 @@ void VariationsService::CreateTrialFromStudy( return; } - const base::Time epoch = base::Time::UnixEpoch(); const base::Time expiry_date = - epoch + base::TimeDelta::FromSeconds(study.expiry_date()); + ConvertStudyDateToBaseTime(study.expiry_date()); base::Time::Exploded exploded_end_date; expiry_date.UTCExplode(&exploded_end_date); -- cgit v1.1