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

chrome/browser/browser_process_impl.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.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
@@ skipping 50 matching lines @@
   // BrowserProcess implementation.
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual void EndSession() OVERRIDE;
   virtual MetricsService* metrics_service() OVERRIDE;
   virtual IOThread* io_thread() OVERRIDE;
   virtual WatchDogThread* watchdog_thread() OVERRIDE;
   virtual ProfileManager* profile_manager() OVERRIDE;
   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)
   virtual ExtensionEventRouterForwarder*
         extension_event_router_forwarder() OVERRIDE;
   virtual NotificationUIManager* notification_ui_manager() OVERRIDE;
   virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE;
   virtual policy::PolicyService* policy_service() OVERRIDE;
   virtual IconManager* icon_manager() OVERRIDE;
   virtual ThumbnailGenerator* GetThumbnailGenerator() OVERRIDE;
@@ skipping 40 matching lines @@
 
  private:
   void CreateMetricsService();
   void CreateWatchdogThread();
 #if defined(OS_CHROMEOS)
   void InitializeWebSocketProxyThread();
 #endif
   void CreateTemplateURLService();
   void CreateProfileManager();
   void CreateLocalState();
+  void CreateVariationsService();
   void CreateViewedPageTracker();
   void CreateIconManager();
   void CreateIntranetRedirectDetector();
   void CreateNotificationUIManager();
   void CreateStatusTrayManager();
   void CreateTabCloseableStateWatcher();
   void CreatePrintPreviewTabController();
   void CreateBackgroundPrintingManager();
   void CreateSafeBrowsingService();
   void CreateSafeBrowsingDetectionService();
@@ skipping 32 matching lines @@
   bool created_browser_policy_connector_;
   scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
 
   scoped_refptr<printing::PrintPreviewTabController>
       print_preview_tab_controller_;
 
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
 
   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_;
 
 #if defined(ENABLE_AUTOMATION)
   scoped_ptr<AutomationProviderList> automation_provider_list_;
 #endif
 
   scoped_ptr<IntranetRedirectDetector> intranet_redirect_detector_;
 
@@ skipping 64 matching lines @@
 #endif
 
   // TODO(eroman): Remove this when done debugging 113031. This tracks
   // the callstack which released the final module reference count.
   base::debug::StackTrace release_last_reference_callstack_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_