Revert of Only build various flash/pnacl/ppapi code when they are enabled.

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 018701c62d322237a3f543e6e2e6b9b540c889a6..a0a63863cec6b6fe2f37ebd94dd9d3ca501f488d 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1053,6 +1053,8 @@
       'browser/ui/webui/fileicon_source.h',
       'browser/ui/webui/flags_ui.cc',
       'browser/ui/webui/flags_ui.h',
+      'browser/ui/webui/flash_ui.cc',
+      'browser/ui/webui/flash_ui.h',
       'browser/ui/webui/gcm_internals_ui.cc',
       'browser/ui/webui/gcm_internals_ui.h',
       'browser/ui/webui/history_ui.cc',
@@ -1846,8 +1848,6 @@
     'chrome_browser_ui_plugin_sources': [
       'browser/ui/hung_plugin_tab_helper.cc',
       'browser/ui/hung_plugin_tab_helper.h',
-      'browser/ui/webui/flash_ui.cc',
-      'browser/ui/webui/flash_ui.h',
     ],
     'chrome_browser_ui_policy_sources': [
       'browser/ui/webui/policy_ui.cc',
@@ -2614,6 +2614,7 @@
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_system_impl',
             '../net/net.gyp:net_with_v8',
+            '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
@@ -2673,7 +2674,6 @@
           'sources': [ '<@(chrome_browser_ui_plugin_sources)' ],
           'dependencies': [
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
-            '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
           ],
         }],
         ['safe_browsing==1', {