Reverting most of r81003.

build/all.gyp

 # Copyright (c) 2010 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': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 188 matching lines @@
     }, # target_name: chromium_builder_tests
     {
       'target_name': 'chromium_2010_builder_tests',
       'type': 'none',
       'dependencies': [
         '../chrome/chrome.gyp:chrome',
         '../app/app.gyp:app_unittests',
         '../base/base.gyp:base_unittests',
         '../chrome/chrome.gyp:browser_tests',
         '../chrome/chrome.gyp:interactive_ui_tests',
-        '../chrome/chrome.gyp:nacl_ui_tests',
-        '../chrome/chrome.gyp:nacl_sandbox_tests',
+        # TODO(bradnelson): fix and enable.
+        #'../chrome/chrome.gyp:nacl_ui_tests',
+        #'../chrome/chrome.gyp:nacl_sandbox_tests',
         '../chrome/chrome.gyp:safe_browsing_tests',
         '../chrome/chrome.gyp:sync_integration_tests',
         '../chrome/chrome.gyp:sync_unit_tests',
         '../chrome/chrome.gyp:ui_tests',
         '../chrome/chrome.gyp:unit_tests',
         '../ui/ui.gyp:gfx_unittests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
         '../jingle/jingle.gyp:jingle_unittests',
         '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../printing/printing.gyp:printing_unittests',
         '../remoting/remoting.gyp:remoting_unittests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         'temp_gyp/googleurl.gyp:googleurl_unittests',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
             '../chrome/chrome.gyp:installer_util_unittests',
-            '../chrome/chrome.gyp:mini_installer_test',
+            # TODO(bradnelson): fix and enable.
+            #'../chrome/chrome.gyp:mini_installer_test',
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
-            # TODO(bradnelson): fix and enable.
             #'../chrome/installer/mini_installer.gyp:mini_installer',
             #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
             #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
             #'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
             #'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             #'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             #'../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../courgette/courgette.gyp:courgette_unittests',
             '../sandbox/sandbox.gyp:sbox_integration_tests',
             '../sandbox/sandbox.gyp:sbox_unittests',
@@ skipping 310 matching lines @@
       ],  # targets
     }], # "chromeos==1"
   ], # conditions
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: