Supporting study definitions without default groups and end_date filtering.

components/variations/study_filtering.cc

 // Copyright 2014 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/variations/study_filtering.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 125 matching lines @@
                          const base::Time& date_time) {
   if (filter.has_start_date()) {
     const base::Time start_date =
         ConvertStudyDateToBaseTime(filter.start_date());
     return date_time >= start_date;
   }
 
   return true;
 }
 
+bool CheckStudyEndDate(const Study_Filter& filter,
+                       const base::Time& date_time) {
+  if (filter.has_end_date()) {
+    const base::Time end_date = ConvertStudyDateToBaseTime(filter.end_date());
+    return end_date >= date_time;
+  }
+
+  return true;
+}
+
 bool CheckStudyVersion(const Study_Filter& filter,
                        const base::Version& version) {
   if (filter.has_min_version()) {
     if (version.CompareToWildcardString(filter.min_version()) < 0)
       return false;
   }
 
   if (filter.has_max_version()) {
     if (version.CompareToWildcardString(filter.max_version()) > 0)
       return false;
@@ skipping 62 matching lines @@
       DVLOG(1) << "Filtered out study " << study.name() << " due to version.";
       return false;
     }
 
     if (!CheckStudyStartDate(study.filter(), reference_date)) {
       DVLOG(1) << "Filtered out study " << study.name() <<
                   " due to start date.";
       return false;
     }
 
+    if (!CheckStudyEndDate(study.filter(), reference_date)) {
+      DVLOG(1) << "Filtered out study " << study.name() << " due to end date.";
+      return false;
+    }
+
     if (!CheckStudyHardwareClass(study.filter(), hardware_class)) {
       DVLOG(1) << "Filtered out study " << study.name() <<
                   " due to hardware_class.";
       return false;
     }
 
     if (!CheckStudyCountry(study.filter(), country)) {
       DVLOG(1) << "Filtered out study " << study.name() << " due to country.";
       return false;
     }
@@ skipping 61 matching lines @@
 
   for (size_t i = 0; i < expired_studies.size(); ++i) {
     if (!base::ContainsKey(created_studies, expired_studies[i]->name())) {
       ProcessedStudy::ValidateAndAppendStudy(expired_studies[i], true,
                                              filtered_studies);
     }
   }
 }
 
 }  // namespace variations