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

chrome/browser/chromeos/login/base_login_display_host.cc

Index: chrome/browser/chromeos/login/base_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index 5d70c27ddf9eb40b1abf59ed12104c6470b7fa25..30b690681530baa797c86022c8805bcc9ffa52a1 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
+#include "chrome/browser/metrics/variations/variations_service.h"

[SteveT, 2012/09/06 19:52:20]

Note that we add this header here because otherwise the AddObserver call below
does not know that g_browser_process->variations_service() returns something
that inherits from WizardController::Observer due to the way everything is
forward declared in chrome_browser_process.h.

 #include "chrome/browser/policy/auto_enrollment_client.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -196,6 +197,10 @@ void BaseLoginDisplayHost::StartWizard(
   wizard_controller_.reset();
   wizard_controller_.reset(CreateWizardController());
 
+  // The VariationsService needs to be notified by the controller. The service
+  // will remove itself as an observer when notified.
+  wizard_controller_->AddObserver(g_browser_process->variations_service());
+
   oobe_progress_bar_visible_ = !WizardController::IsDeviceRegistered();
   SetOobeProgressBarVisible(oobe_progress_bar_visible_);
   wizard_controller_->Init(first_screen_name, screen_parameters);