DevTools: always bundle remote modules in CrOS.

Bug: 747349
Change-Id: I4569b4107536ed02038c2b736a30dd93cf977fce
Reviewed-on: https://chromium-review.googlesource.com/972451Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Paul Irish <paulirish@chromium.org>
Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544621}

chrome/browser/devtools/devtools_window.cc

@@ -1034,8 +1034,15 @@ GURL DevToolsWindow::GetDevToolsURL(Profile* profile,
                                     const std::string& panel,
                                     bool has_other_clients) {
   std::string url;
+
+// Modules are always bundled in CrOS.
+#if defined(OS_CHROMEOS)
+  std::string remote_base = "?";
+#else
   std::string remote_base =
       "?remoteBase=" + DevToolsUI::GetRemoteBaseURL().spec();
+#endif
+
   // remoteFrontend is here for backwards compatibility only.
   std::string remote_frontend =
       frontend_url + ((frontend_url.find("?") == std::string::npos)

third_party/WebKit/Source/devtools/BUILD.gn

@@ -1041,9 +1041,6 @@ generated_non_autostart_non_remote_modules = [
   "$resources_out_dir/workspace_diff/workspace_diff_module.js",
 ]
 
-generated_resources =
-    generated_applications + generated_non_autostart_non_remote_modules
-
 generated_remote_modules = [
   "$resources_out_dir/accessibility/accessibility_module.js",
   "$resources_out_dir/audits2_worker/audits2_worker_module.js",
@@ -1118,8 +1115,16 @@ action("generate_devtools_grd") {
     ":devtools_frontend_resources",
   ]
 
-  grd_files = generated_resources + devtools_embedder_scripts +
-              [ "$resources_out_dir/devtools_extension_api.js" ]
+  grd_files =
+      generated_applications + generated_non_autostart_non_remote_modules +
+      devtools_embedder_scripts +
+      [ "$resources_out_dir/devtools_extension_api.js" ]
+
+  # Bundle remote modules in ChromeOS.
+  if (is_chromeos) {
+    grd_files += generated_remote_modules
+  }
+
   inputs = grd_files + devtools_image_files
   outfile = "$root_gen_dir/devtools/devtools_resources.grd"
   outputs = [
@@ -1202,7 +1207,9 @@ action("build_release_devtools") {
 
   inputs = helper_scripts + all_devtools_files + generated_scripts +
            application_templates
-  outputs = generated_resources + generated_remote_modules
+  outputs =
+      generated_applications + generated_non_autostart_non_remote_modules +
+      generated_remote_modules
 
   args = devtools_applications + [
            "--input_path",