Land prep work to enable NaCl in the Linux x64 GN builds.

extensions/shell/BUILD.gn

Index: extensions/shell/BUILD.gn
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index 89d2d247f98c5a363f92b9a11fe2e5887c086089..2b7f8fa54d157c8797a38cd2980ef388e5db1116 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -58,18 +58,91 @@ source_set("app_shell_lib") {
     "//v8",
   ]
 
-  sources = rebase_path(app_shell_gypi_values.app_shell_lib_sources,

[brettw, 2015/02/25 21:27:29]

Why did you change this?

[Dirk Pranke, 2015/02/25 21:37:40]

I suspect that was unintentional and came in automatically in my merge to HEAD.
I'll put it back.

-                        ".",
-                        "//extensions/shell")
-
-  if (use_aura) {
-    deps += [ "//ui/wm" ]
-
-    aura_sources = rebase_path(app_shell_gypi_values.app_shell_lib_sources_aura,
-                               ".",
-                               "//extensions/shell")
-    sources += aura_sources
-  }
+  sources = [
+    "app/shell_main_delegate.cc",
+    "app/shell_main_delegate.h",
+    "browser/api/identity/identity_api.cc",
+    "browser/api/identity/identity_api.h",
+    "browser/default_shell_browser_main_delegate.cc",
+    "browser/default_shell_browser_main_delegate.h",
+    "browser/desktop_controller.cc",
+    "browser/desktop_controller.h",
+    "browser/media_capture_util.cc",
+    "browser/media_capture_util.h",
+    "browser/shell_app_delegate.cc",
+    "browser/shell_app_delegate.h",
+    "browser/shell_app_view_guest_delegate.cc",
+    "browser/shell_app_view_guest_delegate.h",
+    "browser/shell_app_window_client.cc",
+    "browser/shell_app_window_client.h",
+    "browser/shell_app_window_client_aura.cc",
+    "browser/shell_audio_controller_chromeos.cc",
+    "browser/shell_audio_controller_chromeos.h",
+    "browser/shell_browser_context.cc",
+    "browser/shell_browser_context.h",
+    "browser/shell_browser_context_keyed_service_factories.cc",
+    "browser/shell_browser_context_keyed_service_factories.h",
+    "browser/shell_browser_main_delegate.h",
+    "browser/shell_browser_main_parts.cc",
+    "browser/shell_browser_main_parts.h",
+    "browser/shell_content_browser_client.cc",
+    "browser/shell_content_browser_client.h",
+    "browser/shell_desktop_controller_aura.cc",
+    "browser/shell_desktop_controller_aura.h",
+    "browser/shell_device_client.cc",
+    "browser/shell_device_client.h",
+    "browser/shell_display_info_provider.cc",
+    "browser/shell_display_info_provider.h",
+    "browser/shell_extension_host_delegate.cc",
+    "browser/shell_extension_host_delegate.h",
+    "browser/shell_extension_system.cc",
+    "browser/shell_extension_system.h",
+    "browser/shell_extension_system_factory.cc",
+    "browser/shell_extension_system_factory.h",
+    "browser/shell_extension_web_contents_observer.cc",
+    "browser/shell_extension_web_contents_observer.h",
+    "browser/shell_extensions_api_client.cc",
+    "browser/shell_extensions_api_client.h",
+    "browser/shell_extensions_browser_client.cc",
+    "browser/shell_extensions_browser_client.h",
+    "browser/shell_native_app_window.cc",
+    "browser/shell_native_app_window.h",
+    "browser/shell_native_app_window_aura.cc",
+    "browser/shell_native_app_window_aura.h",
+    "browser/shell_network_controller_chromeos.cc",
+    "browser/shell_network_controller_chromeos.h",
+    "browser/shell_network_delegate.cc",
+    "browser/shell_network_delegate.h",
+    "browser/shell_oauth2_token_service.cc",
+    "browser/shell_oauth2_token_service.h",
+    "browser/shell_prefs.cc",
+    "browser/shell_prefs.h",
+    "browser/shell_runtime_api_delegate.cc",
+    "browser/shell_runtime_api_delegate.h",
+    "browser/shell_screen.cc",
+    "browser/shell_screen.h",
+    "browser/shell_special_storage_policy.cc",
+    "browser/shell_special_storage_policy.h",
+    "browser/shell_speech_recognition_manager_delegate.cc",
+    "browser/shell_speech_recognition_manager_delegate.h",
+    "browser/shell_update_query_params_delegate.cc",
+    "browser/shell_update_query_params_delegate.h",
+    "browser/shell_url_request_context_getter.cc",
+    "browser/shell_url_request_context_getter.h",
+    "browser/shell_web_contents_modal_dialog_manager.cc",
+    "common/shell_content_client.cc",
+    "common/shell_content_client.h",
+    "common/shell_extensions_client.cc",
+    "common/shell_extensions_client.h",
+    "common/switches.cc",
+    "common/switches.h",
+    "renderer/shell_content_renderer_client.cc",
+    "renderer/shell_content_renderer_client.h",
+    "renderer/shell_extensions_renderer_client.cc",
+    "renderer/shell_extensions_renderer_client.h",
+    "utility/shell_content_utility_client.cc",
+    "utility/shell_content_utility_client.h",
+  ]
 
   if (is_chromeos) {
     deps += [
@@ -105,6 +178,26 @@ source_set("app_shell_lib") {
       sources += nacl_sources
     }
   }
+
+  if (enable_nacl) {
+    sources += [
+      "browser/shell_nacl_browser_delegate.cc",
+      "browser/shell_nacl_browser_delegate.h",
+    ]
+
+    deps += [
+      "//components/nacl",
+      "//components/nacl:nacl_browser",
+      "//components/nacl:nacl_common",
+      "//components/nacl:nacl_renderer",
+      "//components/nacl:nacl_switches",
+      "//components/nacl/renderer/plugin:nacl_trusted_plugin",
+    ]
+
+    if (is_linux) {
+      deps += [ "//components/nacl:nacl_helper" ]
+    }
+  }
 }
 
 if (!(is_chromeos && !use_ozone) && (!is_win || link_chrome_on_windows)) {