Consolidate 'variations' and 'variations_seed_proto' targets.

chrome/chrome_browser.gypi

 # Copyright 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',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 13 matching lines @@
         'feedback_proto',
         'in_memory_url_index_cache_proto',
         'probe_message_proto',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         '../components/components.gyp:browser_context_keyed_service',
         '../components/components.gyp:encryptor',
         '../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',
         '../components/components.gyp:webdata_common',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
         '../google_apis/google_apis.gyp:google_apis',
         '../jingle/jingle.gyp:notifier',
         '../skia/skia.gyp:skia',
@@ skipping 3511 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }