Consolidate 'variations' and 'variations_seed_proto' targets.

chrome/chrome_browser_chromeos.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_chromeos',
       'type': 'static_library',
@@ skipping 32 matching lines @@
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         '../breakpad/breakpad.gyp:breakpad_client',
         '../build/linux/system.gyp:dbus',
         '../chromeos/chromeos.gyp:chromeos',
         '../chromeos/chromeos.gyp:chromeos_memory',
         # 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',
         '../dbus/dbus.gyp:dbus',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
@@ skipping 922 matching lines @@
         'browser/chromeos/attestation/attestation_key_payload.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/attestation',
         'proto_out_dir': 'chrome/browser/chromeos/attestation',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }