Restoring the chrome variatioons client, with a fix for browser_test failures caused by it.

chrome/browser/browser_process_impl.h

Index: chrome/browser/browser_process_impl.h
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 16685e474afb57b6d9276be04f22508bde00ed19..ba38b2faed295f78495fcd81ae3e7bd8f74d02f6 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -68,6 +68,7 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual PrefService* local_state() OVERRIDE;
   virtual ui::Clipboard* clipboard() OVERRIDE;
   virtual net::URLRequestContextGetter* system_request_context() OVERRIDE;
+  virtual VariationsService* variations_service() OVERRIDE;
 #if defined(OS_CHROMEOS)
   virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE;
 #endif  // defined(OS_CHROMEOS)
@@ -128,6 +129,7 @@ class BrowserProcessImpl : public BrowserProcess,
   void CreateTemplateURLService();
   void CreateProfileManager();
   void CreateLocalState();
+  void CreateVariationsService();
   void CreateViewedPageTracker();
   void CreateIconManager();
   void CreateIntranetRedirectDetector();
@@ -180,6 +182,9 @@ class BrowserProcessImpl : public BrowserProcess,
 
   scoped_ptr<ui::Clipboard> clipboard_;
 
+  bool created_variations_service_;

[Ilya Sherman, 2012/05/15 22:11:17]

nit: Why do we need this boolean?  Can't this be inferred based on whether
|variations_service_| is null?

[jwd, 2012/05/16 14:47:31]

Done.

+  scoped_ptr<VariationsService> variations_service_;
+
   // Manager for desktop notification UI.
   bool created_notification_ui_manager_;
   scoped_ptr<NotificationUIManager> notification_ui_manager_;