Revert "Have the ability for the PFQ to both rev Chrome and ..."

bin/cbuildbot_config.py

Index: bin/cbuildbot_config.py
diff --git a/bin/cbuildbot_config.py b/bin/cbuildbot_config.py
index a1aa2fdb34dc2e498f1812c948b046ec18bd8054..ccd514b47b48c524f516ae98183b29ce8bbf76b8 100644
--- a/bin/cbuildbot_config.py
+++ b/bin/cbuildbot_config.py
@@ -25,7 +25,7 @@ push_overlays -- Select what overlays to push at. This should be a subset of
                  rev_overlays for the particular builder.  Must be None if
                  not a master.  There should only be one master bot pushing
                  changes to each overlay per branch.
-
+                 
 unittests -- Runs unittests for packages.
 vm_tests -- Runs the smoke suite and au test harness in a qemu-based VM
             using KVM.
@@ -58,7 +58,7 @@ default = {
 
   'usepkg' : True,
   'chroot_replace' : False,
-
+  
   'archive_build' : False,
   'test_mod' : True,
   'factory_install_mod' : True,
@@ -76,14 +76,10 @@ config['x86-generic-pre-flight-queue'].update({
   'rev_overlays': 'public',
   'push_overlays': 'public',
 })
-config['x86-generic-chrome-pre-flight-queue'] = default.copy()
-config['x86-generic-chrome-pre-flight-queue'].update({
-  'board' : 'x86-generic',
-  'uprev' : False,
-  'master' : True,
-  'rev_overlays': 'public',
-  'push_overlays': 'public',
-})
+
+config['x86-generic-chrome-pre-flight-queue'] = \
+    config['x86-generic-pre-flight-queue']
+
 config['x86-mario-pre-flight-queue'] = default.copy()
 config['x86-mario-pre-flight-queue'].update({
   'board' : 'x86-mario',
@@ -92,6 +88,7 @@ config['x86-mario-pre-flight-queue'].update({
   'rev_overlays': 'both',
   'push_overlays': 'private',
 })
+
 config['x86-mario-pre-flight-branch'] = default.copy()
 config['x86-mario-pre-flight-branch'].update({
   'board' : 'x86-mario',
@@ -149,6 +146,6 @@ config['arm-generic-bin'].update({
 # TODO(dgarrett) delete when buildbot updated to use new names
 config['x86_agz_bin'] = config['x86-agz-bin']
 config['x86_dogfood_bin'] = config['x86-dogfood-bin']
-config['x86_pineview_bin'] = config['x86-pineview-bin']
-config['arm_tegra2_bin'] = config['arm-tegra2-bin']
-config['arm_generic_bin'] = config['arm-generic-bin']
+config['x86_pineview_bin'] = config['x86-pineview-bin'] 
+config['arm_tegra2_bin'] = config['arm-tegra2-bin'] 
+config['arm_generic_bin'] = config['arm-generic-bin']