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

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 12 matching lines @@
         'common',
         'common/extensions/api/api.gyp:api',
         'common_net',
         'debugger',
         'in_memory_url_index_cache_proto',
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         'feedback_proto',
         'gdata_proto',
+        'variations_seed_proto',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         # TODO(akalin): Depend only on syncapi_service from sync.
         '../sync/sync.gyp:syncapi_core',
@@ skipping 1309 matching lines @@
         'browser/metrics/metrics_reporting_scheduler.h',
         'browser/metrics/metrics_response.cc',
         'browser/metrics/metrics_response.h',
         'browser/metrics/metrics_service.cc',
         'browser/metrics/metrics_service.h',
         'browser/metrics/thread_watcher.cc',
         'browser/metrics/thread_watcher.h',
         'browser/metrics/tracking_synchronizer.cc',
         'browser/metrics/tracking_synchronizer.h',
         'browser/metrics/tracking_synchronizer_observer.h',
+        'browser/metrics/variations_service.cc',
+        'browser/metrics/variations_service.h',
         'browser/native_window_notification_source.h',
         'browser/net/chrome_cookie_notification_details.h',
         'browser/net/chrome_fraudulent_certificate_reporter.cc',
         'browser/net/chrome_fraudulent_certificate_reporter.h',
         'browser/net/chrome_net_log.cc',
         'browser/net/chrome_net_log.h',
         'browser/net/chrome_network_delegate.cc',
         'browser/net/chrome_network_delegate.h',
         'browser/net/chrome_url_request_context.cc',
         'browser/net/chrome_url_request_context.h',
@@ skipping 3675 matching lines @@
       # Protobuf compiler / generator for the GData protocol buffer.
       'target_name': 'gdata_proto',
       'type': 'static_library',
       'sources': [ 'browser/chromeos/gdata/gdata.proto' ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/gdata',
         'proto_out_dir': 'chrome/browser/chromeos/gdata',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
+    {
+      # Protobuf compiler / generator for Chrome Variations seed.
+      'target_name': 'variations_seed_proto',
+      'type': 'static_library',
+      'sources': [ 
+        'browser/metrics/proto/trials_seed.proto',
+        'browser/metrics/proto/study.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/metrics/proto',
+        'proto_out_dir': 'chrome/browser/metrics/proto',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
   ],
 }