Cleaning up remoting resource files

With the Webapp gone, I am updating some build rules to be less webapp
specific.

Change-Id: I420aa95f9a87095008b5c39ef552db786b2301f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947985Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721206}

remoting/host/BUILD.gn

@@ -695,7 +695,7 @@ if (enable_remoting_host) {
     script = "//remoting/tools/build/remoting_localize.py"
     args = [
              "--locale_dir",
-             rebase_path(webapp_locale_dir, root_build_dir),
+             rebase_path(resources_locale_dir, root_build_dir),
              "--variables",
              rebase_path(branding_path, root_build_dir),
              "--template",

remoting/host/win/BUILD.gn

@@ -252,7 +252,7 @@ remoting_localize("messages_localizing") {
     "host_messages.mc.jinja2",
   ]
   locales = remoting_locales
-  locale_dir = webapp_locale_dir
+  locale_dir = resources_locale_dir
   encoding = "utf-16"
 
   # This target is funny. It only produces one file and the output doesn't
@@ -513,7 +513,7 @@ remoting_localize("remoting_windows_resources") {
 
   output = "$root_gen_dir/remoting/{{source_name_part}}"
 
-  locale_dir = webapp_locale_dir
+  locale_dir = resources_locale_dir
 
   encoding = "utf-16"
 

remoting/ios/app/resources/BUILD.gn

@@ -96,7 +96,7 @@ action("infoplist_strings") {
   script = "//remoting/tools/build/remoting_localize.py"
   args = [
            "--locale_dir",
-           rebase_path(webapp_locale_dir, root_build_dir),
+           rebase_path(resources_locale_dir, root_build_dir),
            "--variables",
            rebase_path(branding_path, root_build_dir),
            "--template",

remoting/remoting_locales.gni

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-webapp_locale_dir = "$root_gen_dir/remoting/webapp/_locales"
+resources_locale_dir = "$root_gen_dir/remoting/resources/_locales"
 
 # See also remoting_locales_with_underscores below.
 remoting_locales = [
@@ -168,7 +168,7 @@ remoting_android_locales = [
 ]
 
 # The list of .json files generated by remoting_strings.grd.
-remoting_webapp_locale_files =
+remoting_resources_locale_files =
     process_file_template(
         messages_locales,
-        [ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ])
+        [ "remoting/resources/_locales/{{source_name_part}}/messages.json" ])

remoting/resources/BUILD.gn

@@ -17,14 +17,10 @@ group("resources") {
   ]
 }
 
-# TODO(GYP) enable verify_resources. The bots are complaining about
-# gen/main.html not being found but this doesn't seems to reproduce locally.
-
 action("verify_resources") {
   script = "//remoting/tools/verify_resources.py"
 
   sources_to_verify = [
-    #    "$root_gen_dir/main.html",
     "../host/continue_window_mac.mm",
     "../host/disconnect_window_mac.mm",
     "../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
@@ -46,10 +42,6 @@ action("verify_resources") {
            "-r",
            rebase_path("remoting_strings.grd", root_build_dir),
          ] + rebase_path(sources_to_verify, root_build_dir)
-
-  deps = [
-    #    "//remoting/webapp:webapp",
-  ]  # Generates main.html.
 }
 
 if (is_android) {
@@ -78,7 +70,7 @@ grit("strings") {
       process_file_template(remoting_locales,
                             [ "remoting/resources/{{source_name_part}}.pak" ])
 
-  outputs += remoting_webapp_locale_files
+  outputs += remoting_resources_locale_files
 
   if (is_android) {
     outputs += android_string_outputs