Activate the VariationsService for ChromeOS and ensure that it does not ping the server until the E…

chrome/browser/metrics/variations/variations_service.h

Index: chrome/browser/metrics/variations/variations_service.h
diff --git a/chrome/browser/metrics/variations/variations_service.h b/chrome/browser/metrics/variations/variations_service.h
index 3f341212ecf699343c3fa375ef22928e77eae42e..93dfcbde2a0ec7ceeaae8370559f59f4384291fa 100644
--- a/chrome/browser/metrics/variations/variations_service.h
+++ b/chrome/browser/metrics/variations/variations_service.h
@@ -20,6 +20,10 @@
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/wizard_controller.h"
+#endif
+
 class PrefService;
 
 namespace chrome_variations {
@@ -28,7 +32,10 @@ namespace chrome_variations {
 // new seed data from the variations server.
 class VariationsService
     : public net::URLFetcherDelegate,
-      public net::NetworkChangeNotifier::ConnectionTypeObserver{
+#if defined(OS_CHROMEOS)
+      public chromeos::WizardController::Observer,
+#endif
+      public net::NetworkChangeNotifier::ConnectionTypeObserver {
  public:
   VariationsService();
   virtual ~VariationsService();
@@ -52,6 +59,15 @@ class VariationsService
   // Exposed for testing.
   void SetWasOfflineDuringLastRequestAttemptForTesting(bool offline);
 
+#if defined(OS_CHROMEOS)
+  // chromeos::WizardController::Observer implementation:
+  virtual void OnScreenChanged(chromeos::WizardScreen* next_screen) OVERRIDE;
+
+  virtual void OnSessionStart() OVERRIDE;

[Alexei Svitkine (slow), 2012/09/10 16:50:11]

Remove empty lines between these functions.

[SteveT, 2012/09/10 19:33:52]

Done.

+
+  virtual void OnEulaAccepted() OVERRIDE;
+#endif
+
   // Register Variations related prefs in Local State.
   static void RegisterPrefs(PrefService* prefs);
 
@@ -146,6 +162,12 @@ class VariationsService
   // it gets called prior to |StartRepeatedVariationsSeedFetch|.
   bool create_trials_from_seed_called_;
 
+#if defined(OS_CHROMEOS)
+  // Tracks whether or not the service is waiting for the user to accept the
+  // EULA before performing the next request.
+  bool waiting_for_user_to_accept_eula_;
+#endif
+
   // Tracks whether or not the last seed request attempt failed due to being
   // offline.
   bool was_offline_during_last_request_attempt_;