[Variations] Refactor all state used for study filtering into a container struct.

components/variations/service/variations_service.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_VARIATIONS_SERVICE_VARIATIONS_SERVICE_H_
 #define COMPONENTS_VARIATIONS_SERVICE_VARIATIONS_SERVICE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
+#include "components/variations/client_filterable_state.h"
 #include "components/variations/service/ui_string_overrider.h"
 #include "components/variations/service/variations_service_client.h"
 #include "components/variations/variations_request_scheduler.h"
 #include "components/variations/variations_seed_simulator.h"
 #include "components/variations/variations_seed_store.h"
 #include "components/version_info/version_info.h"
 #include "components/web_resource/resource_request_allowed_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
@@ skipping 200 matching lines @@
     LOAD_COUNTRY_HAS_BOTH_VERSION_NEQ_COUNTRY_EQ,
     LOAD_COUNTRY_HAS_BOTH_VERSION_NEQ_COUNTRY_NEQ,
     LOAD_COUNTRY_MAX,
   };
 
   // Loads the seed from the variations store into |seed|. If successfull,
   // |seed| will contain the loaded data and true is returned. Set as virtual
   // so that it can be overridden by tests.
   virtual bool LoadSeed(VariationsSeed* seed);
 
+  // Returns all of the client state used for filtering studies.
+  // As a side-effect, may update the stored permanent consistency country.
+  std::unique_ptr<ClientFilterableState> GetClientFilterableStateForVersion(
+      const base::Version& version);
+
   // Sets the stored permanent country pref for this client.
   void StorePermanentCountry(const base::Version& version,
                              const std::string& country);
 
   // Checks if prerequisites for fetching the Variations seed are met, and if
   // so, performs the actual fetch using |DoActualFetch|.
   void FetchVariationsSeed();
 
   // Notify any observers of this service based on the simulation |result|.
   void NotifyObservers(
@@ skipping 86 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<VariationsService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VariationsService);
 };
 
 }  // namespace variations
 
 #endif  // COMPONENTS_VARIATIONS_SERVICE_VARIATIONS_SERVICE_H_