Adding support for exclude locales to variations.

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 88 matching lines @@
         filter.exclude_hardware_class(i));
     if (position != std::string::npos)
       return false;
   }
 
   // None of the exclusions match, so this accepts.
   return true;
 }
 
 bool CheckStudyLocale(const Study_Filter& filter, const std::string& locale) {
-  // An empty locale list matches all locales.
-  if (filter.locale_size() == 0)
+  // Empty locale and exclude_locale lists matches all locales.
+  if (filter.locale_size() == 0 && filter.exclude_locale_size() == 0)
     return true;
 
-  for (int i = 0; i < filter.locale_size(); ++i) {
-    if (filter.locale(i) == locale)
-      return true;
-  }
-  return false;
+  // Check if we are supposed to filter for a specified set of countries. Note
+  // that this means this overrides the exclude_locale in case that ever occurs
+  // (which it shouldn't).
+  if (filter.locale_size() > 0)
+    return base::ContainsValue(filter.locale(), locale);
+
+  // Omit if matches any of the exclude entries.
+  return !base::ContainsValue(filter.exclude_locale(), locale);
 }
 
 bool CheckStudyPlatform(const Study_Filter& filter, Study_Platform platform) {
   // An empty platform list matches all platforms.
   if (filter.platform_size() == 0)
     return true;
 
   for (int i = 0; i < filter.platform_size(); ++i) {
     if (filter.platform(i) == platform)
       return true;
@@ skipping 168 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