Revert of Supporting study definitions without default groups and end_date filtering.

components/variations/study_filtering_unittest.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 <string.h>
 
@@ skipping 209 matching lines @@
   }
 }
 
 TEST(VariationsStudyFilteringTest, CheckStudyStartDate) {
   const base::Time now = base::Time::Now();
   const base::TimeDelta delta = base::TimeDelta::FromHours(1);
   const struct {
     const base::Time start_date;
     bool expected_result;
   } start_test_cases[] = {
-      {now - delta, true},
-      // Note, the proto start_date is truncated to seconds, but the reference
-      // date isn't.
-      {now, true},
-      {now + delta, false},
+    { now - delta, true },
+    { now, true },
+    { now + delta, false },
   };
 
   Study_Filter filter;
 
   // Start date not set should result in true.
   EXPECT_TRUE(internal::CheckStudyStartDate(filter, now));
 
   for (size_t i = 0; i < arraysize(start_test_cases); ++i) {
     filter.set_start_date(TimeToProtoTime(start_test_cases[i].start_date));
     const bool result = internal::CheckStudyStartDate(filter, now);
     EXPECT_EQ(start_test_cases[i].expected_result, result)
         << "Case " << i << " failed!";
   }
 }
 
-TEST(VariationsStudyFilteringTest, CheckStudyEndDate) {
-  const base::Time now = base::Time::Now();
-  const base::TimeDelta delta = base::TimeDelta::FromHours(1);
-  const struct {
-    const base::Time end_date;
-    bool expected_result;
-  } start_test_cases[] = {
-      {now - delta, false}, {now + delta, true},
-  };
-
-  Study_Filter filter;
-
-  // End date not set should result in true.
-  EXPECT_TRUE(internal::CheckStudyEndDate(filter, now));
-
-  for (size_t i = 0; i < arraysize(start_test_cases); ++i) {
-    filter.set_end_date(TimeToProtoTime(start_test_cases[i].end_date));
-    const bool result = internal::CheckStudyEndDate(filter, now);
-    EXPECT_EQ(start_test_cases[i].expected_result, result) << "Case " << i
-                                                           << " failed!";
-  }
-}
-
 TEST(VariationsStudyFilteringTest, CheckStudyVersion) {
   const struct {
     const char* min_version;
     const char* version;
     bool expected_result;
   } min_test_cases[] = {
     { "1.2.2", "1.2.3", true },
     { "1.2.3", "1.2.3", true },
     { "1.2.4", "1.2.3", false },
     { "1.3.2", "1.2.3", false },
@@ skipping 308 matching lines @@
   EXPECT_TRUE(processed_study.Init(&study, false));
 
   // Max version checks.
   study.mutable_filter()->set_max_version("2.3.4.*");
   EXPECT_TRUE(processed_study.Init(&study, false));
   study.mutable_filter()->set_max_version("*.3");
   EXPECT_FALSE(processed_study.Init(&study, false));
   study.mutable_filter()->set_max_version("2.3.4");
   EXPECT_TRUE(processed_study.Init(&study, false));
 
-  // A blank default study is allowed.
   study.clear_default_experiment_name();
-  EXPECT_TRUE(processed_study.Init(&study, false));
+  EXPECT_FALSE(processed_study.Init(&study, false));
 
   study.set_default_experiment_name("xyz");
   EXPECT_FALSE(processed_study.Init(&study, false));
 
   study.set_default_experiment_name("def");
   default_group->clear_name();
   EXPECT_FALSE(processed_study.Init(&study, false));
 
   default_group->set_name("def");
   EXPECT_TRUE(processed_study.Init(&study, false));
   Study_Experiment* repeated_group = study.add_experiment();
   repeated_group->set_name("abc");
   repeated_group->set_probability_weight(1);
   EXPECT_FALSE(processed_study.Init(&study, false));
 }
 
 }  // namespace variations