Consolidate 'variations' and 'variations_seed_proto' targets.

Merges them to a single 'variations' target to simplify things.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/23604034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221457 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_browser.gypi

@@ -31,10 +31,10 @@
         '../components/components.gyp:sessions',
         '../components/components.gyp:startup_metric_utils',
         '../components/components.gyp:user_prefs',
-        # The direct variations_seed_proto dependency is needed, rather than
-        # using common's dependency on variations, because the proto sources
-        # need to be generated before code in this target can start building.
-        '../components/components.gyp:variations_seed_proto',
+        # This depends directly on the variations target, rather than just
+        # transitively via the common target because the proto sources need to
+        # be generated before code in this target can start building.
+        '../components/components.gyp:variations',
         '../components/components.gyp:visitedlink_browser',
         '../components/components.gyp:visitedlink_common',
         '../components/components.gyp:web_modal',

chrome/chrome_browser_chromeos.gypi

@@ -50,10 +50,10 @@
         # browser_chromeos #includes power_supply_properties.pb.h directly.
         '../chromeos/chromeos.gyp:power_manager_proto',
         '../chromeos/ime/input_method.gyp:gencode',
-        # The direct variations_seed_proto dependency is needed, rather than
-        # using common's dependency on variations, because the proto sources
-        # need to be generated before code in this target can start building.
-        '../components/components.gyp:variations_seed_proto',
+        # This depends directly on the variations target, rather than just
+        # transitively via the common target because the proto sources need to
+        # be generated before code in this target can start building.
+        '../components/components.gyp:variations',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',

components/variations.gypi

@@ -13,11 +13,12 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
-        'variations_seed_proto',
       ],
       'sources': [
         'variations/entropy_provider.cc',
         'variations/entropy_provider.h',
+        'variations/proto/variations_seed.proto',
+        'variations/proto/study.proto',
         'variations/metrics_util.cc',
         'variations/metrics_util.h',
         'variations/variations_associated_data.cc',
@@ -25,18 +26,6 @@
         'variations/variations_seed_processor.cc',
         'variations/variations_seed_processor.h',
       ],
-    },
-    {
-      # Protobuf compiler / generator for Chrome Variations seed.
-      'target_name': 'variations_seed_proto',
-      'type': 'static_library',
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'variations/proto/variations_seed.proto',
-        'variations/proto/study.proto',
-      ],
       'variables': {
         'proto_in_dir': 'variations/proto',
         'proto_out_dir': 'components/variations/proto',