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

chrome/browser/browser_process.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.
 
 // This interface is for managing the global services of the application. Each
 // service is lazily created when requested the first time. The service getters
 // will return NULL if the service is not available, so callers must check for
 // this condition.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_H_
@@ skipping 17 matching lines @@
 class IOThread;
 class MetricsService;
 class NotificationUIManager;
 class PrefService;
 class Profile;
 class ProfileManager;
 class SafeBrowsingService;
 class StatusTray;
 class TabCloseableStateWatcher;
 class ThumbnailGenerator;
+class VariationsService;
 class WatchDogThread;
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class OomPriorityManager;
 }
 #endif  // defined(OS_CHROMEOS)
 
 namespace net {
 class URLRequestContextGetter;
@@ skipping 37 matching lines @@
   // to normal shutdown and saves any state that must be saved before we are
   // continue shutdown.
   virtual void EndSession() = 0;
 
   // Services: any of these getters may return NULL
   virtual MetricsService* metrics_service() = 0;
   virtual ProfileManager* profile_manager() = 0;
   virtual PrefService* local_state() = 0;
   virtual ui::Clipboard* clipboard() = 0;
   virtual net::URLRequestContextGetter* system_request_context() = 0;
+  virtual VariationsService* variations_service() = 0;
 
 #if defined(OS_CHROMEOS)
   // Returns the out-of-memory priority manager.
   virtual chromeos::OomPriorityManager* oom_priority_manager() = 0;
 #endif  // defined(OS_CHROMEOS)
 
   virtual ExtensionEventRouterForwarder*
       extension_event_router_forwarder() = 0;
 
   // Returns the manager for desktop notifications.
@@ skipping 93 matching lines @@
 
   virtual CRLSetFetcher* crl_set_fetcher() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserProcess);
 };
 
 extern BrowserProcess* g_browser_process;
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_H_