Back-out previous hack of the test, because chrome-os-partner:2414 is resolved.

client/site_tests/security_BundledCRXs/security_BundledCRXs.py

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
@@ skipping 35 matching lines @@
         observed_set = self.fetch_bundled_crxs()
         baseline_set = self.load_baseline()
 
         # If something in the observed set is not
         # covered by the baseline...
         diff = observed_set.difference(baseline_set)
         if len(diff) > 0:
             for crx in diff:
                 logging.error('New/unexpected bundled crx %s' % crx)
 
-        # Or, things in baseline are missing from the system. We log missing
-        # CRX's as warnings instead of test failures because we autotest some
-        # builds where extensions aren't bundled. See chrome-os-partner:2414.
-        # TODO(jimhebert) make these warnings fatal after 2414 is resolved.
+        # Or, things in baseline are missing from the system:
         diff2 = baseline_set.difference(observed_set)
         if len(diff2) > 0:
             for crx in diff2:
-                logging.warning('Missing bundled crx %s' % crx)
+                logging.error('Missing bundled crx %s' % crx)
 
-        if len(diff):
+        if (len(diff) + len(diff2)) > 0:
             raise error.TestFail('Baseline mismatch')