Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'dependencies': [
@@ skipping 1624 matching lines @@
         'browser/plugin_data_remover_helper.cc',
         'browser/plugin_data_remover_helper.h',
         'browser/plugin_download_helper.cc',
         'browser/plugin_download_helper.h',
         'browser/plugin_exceptions_table_model.cc',
         'browser/plugin_exceptions_table_model.h',
         'browser/plugin_installer_infobar_delegate.cc',
         'browser/plugin_installer_infobar_delegate.h',
         'browser/plugin_observer.cc',
         'browser/plugin_observer.h',
-        'browser/plugin_updater.cc',
-        'browser/plugin_updater.h',
+        'browser/plugin_prefs.cc',
+        'browser/plugin_prefs.h',
         'browser/policy/asynchronous_policy_loader.cc',
         'browser/policy/asynchronous_policy_loader.h',
         'browser/policy/asynchronous_policy_provider.cc',
         'browser/policy/asynchronous_policy_provider.h',
         'browser/policy/browser_policy_connector.cc',
         'browser/policy/browser_policy_connector.h',
         'browser/policy/cloud_policy_cache_base.cc',
         'browser/policy/cloud_policy_cache_base.h',
         'browser/policy/cloud_policy_controller.cc',
         'browser/policy/cloud_policy_controller.h',
@@ skipping 3352 matching lines @@
               # weak imports in dependents, who still must #include
               # closure_blocks_leopard_compat.h to get weak imports.
               'type': 'none',
             }],
           ],
         },
       ],
     }],
   ],
 }