Revert "OS Settings: Set up optimized build for Polymer 3"

This reverts commit 7ce70f8a.

Reason for revert: Breaks Chrome uprev (https://crbug.com/1093405)

Bug: 1045266, 1093405
TBR: dpapad@chromium.org
TBR: rbpotter@chromium.org
Change-Id: I96c8c8f95aa3f3b06b36373790b30b919c59e9da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249595
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779539}

chrome/browser/resources/BUILD.gn

@@ -289,10 +289,7 @@ if (is_chromeos) {
       enable_input_discovery_for_gn_analyze = false
       source = "settings/os_settings_resources_vulcanized.grd"
 
-      deps += [
-        "//chrome/browser/resources/settings/chromeos:build",
-        "//chrome/browser/resources/settings/chromeos:build_polymer3",
-      ]
+      deps += [ "//chrome/browser/resources/settings/chromeos:build" ]
     } else {
       source = "settings/os_settings_resources.grd"
       deps += [

chrome/browser/resources/optimize_webui.gni

@@ -103,12 +103,5 @@ template("unpak") {
       "--pak_file",
       rebase_path("$target_gen_dir/${invoker.pak_file}", root_build_dir),
     ]
-
-    if (defined(invoker.pak_base_dir)) {
-      args += [
-        "--pak_base_dir",
-        rebase_path("$target_gen_dir/${invoker.pak_base_dir}", root_build_dir),
-      ]
-    }
   }
 }

chrome/browser/resources/optimize_webui.py

@@ -218,10 +218,9 @@ def _bundle_v3(tmp_out_dir, in_path, out_path, manifest_out_path, args,
   # arbitrary names?
   bundled_paths = []
   for index, js_file in enumerate(args.js_module_in_files):
-    base_file_name = os.path.basename(js_file)
-    expected_name = '%s.rollup.js' % base_file_name[:-len('.js')]
+    expected_name = '%s.rollup.js' % js_file[:-len('.js')]
     assert args.js_out_files[index] == expected_name, \
-           'Output file corresponding to %s should be named %s' % \
+           'Output file corresponding to %s should be named %s.rollup.js' % \
            (js_file, expected_name)
     bundled_paths.append(os.path.join(tmp_out_dir, expected_name))
 

chrome/browser/resources/settings/chromeos/BUILD.gn

@@ -14,10 +14,6 @@ if (optimize_webui) {
   settings_pak_file = "os_settings_resources.pak"
   unpak_folder = "os_settings_resources.unpak"
 
-  # Put v3 unpacked files in a separate folder, to avoid a possible race
-  # between v2 and v3 build targets writing files to the same location.
-  unpak_folder_v3 = "os_settings_resources_v3.unpak"
-
   optimize_webui("build") {
     host = "os-settings"
     html_in_files = [
@@ -57,45 +53,6 @@ if (optimize_webui) {
     deps = [ ":unpak" ]
   }
 
-  optimize_webui("build_polymer3") {
-    host = "os-settings"
-    input = rebase_path("$target_gen_dir/$unpak_folder_v3", root_build_dir)
-    js_out_files = [ "os_settings.rollup.js" ]
-    js_module_in_files = [ "chromeos/os_settings.js" ]
-
-    deps = [
-      ":unpak_v3",
-      "../../../../../ui/webui/resources:modulize",
-    ]
-    excludes = [
-      "chrome://resources/js/cr.m.js",
-      "chrome://resources/css/cros_colors.generated.css",
-
-      # TODO: Determine how to move the mojo files into the expected directories
-      # in the unpak folder, so that they can be included in the bundle.
-      "chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js",
-      "app-management/app_management.mojom-lite.js",
-      "app-management/bitmap.mojom-lite.js",
-      "app-management/file_path.mojom-lite.js",
-      "app-management/image_info.mojom-lite.js",
-      "app-management/image.mojom-lite.js",
-      "app-management/types.mojom-lite.js",
-      "constants/routes.mojom-lite.js",
-      "constants/setting.mojom-lite.js",
-      "search/search.mojom-lite.js",
-      "search/search_result_icon.mojom-lite.js",
-      "search/user_action_recorder.mojom-lite.js",
-    ]
-  }
-
-  unpak("unpak_v3") {
-    pak_file = settings_pak_file
-    out_folder = unpak_folder_v3
-    pak_base_dir = "../"
-
-    deps = [ ":flattened_resources" ]
-  }
-
   unpak("unpak") {
     pak_file = settings_pak_file
     out_folder = unpak_folder

chrome/browser/resources/settings/chromeos/os_settings.js

@@ -6,5 +6,5 @@ import './os_reset_page/os_powerwash_dialog.m.js';
 import './os_reset_page/os_reset_page.m.js';
 import './localized_link/localized_link.m.js';
 
-export {LifetimeBrowserProxy, LifetimeBrowserProxyImpl} from '../lifetime_browser_proxy.m.js';
-export {OsResetBrowserProxyImpl} from './os_reset_page/os_reset_browser_proxy.m.js';
\ No newline at end of file
+export {OsResetBrowserProxyImpl} from './os_reset_page/os_reset_browser_proxy.m.js';
+export {LifetimeBrowserProxy, LifetimeBrowserProxyImpl} from '../../lifetime_browser_proxy.m.js';
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp

@@ -29,7 +29,6 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/lifetime_browser_proxy.m.js"
            use_base_dir="false"
            compress="false"
-           preprocess="true"
            type="BINDATA"/>
   <include name="IDR_OS_SETTINGS_SETTINGS_SHARED_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_shared_css.m.js"

chrome/browser/resources/settings/os_settings_resources_vulcanized.grd

@@ -88,17 +88,6 @@
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\user_action_recorder.mojom-lite.js"
                use_base_dir="false"
                type="BINDATA" />
-
-      <!-- Polymer3 related files-->
-      <include name="IDR_OS_SETTINGS_SETTINGS_ROLLUP_JS"
-               file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\os_settings.rollup.js"
-               use_base_dir="false"
-               preprocess="true"
-               type="BINDATA" />
-      <include name="IDR_OS_SETTINGS_OS_SETTINGS_V3_HTML"
-               file="chromeos/os_settings_v3.html"
-               compress="false"
-               type="BINDATA" />
     </includes>
   </release>
 </grit>

chrome/browser/resources/unpack_pak.py

@@ -35,7 +35,7 @@ def GetFileAndDirName(out_path, pak_dir, resource_path):
   dirname = os.path.join(out_path, dirname)
   return (filename, dirname)
 
-def Unpack(pak_path, out_path, pak_base_dir):
+def Unpack(pak_path, out_path):
   pak_dir = os.path.dirname(pak_path)
   pak_id = os.path.splitext(os.path.basename(pak_path))[0]
 
@@ -62,11 +62,10 @@ def Unpack(pak_path, out_path, pak_base_dir):
         resource_filenames[res.group(2)] = res.group(1)
   assert resource_filenames
 
-  root_dir = pak_base_dir if pak_base_dir else pak_dir
   # Extract packed files, while preserving directory structure.
   for (resource_id, text) in data.resources.iteritems():
     (filename, dirname) = GetFileAndDirName(
-        out_path, root_dir, resource_filenames[resource_ids[resource_id]])
+        out_path, pak_dir, resource_filenames[resource_ids[resource_id]])
     if not os.path.exists(dirname):
       os.makedirs(dirname)
     with open(os.path.join(dirname, filename), 'w') as file:
@@ -76,14 +75,10 @@ def Unpack(pak_path, out_path, pak_base_dir):
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--pak_file')
-  # The expected reference point/root path for files appearing in the pak file.
-  # If this argument is not provided, the location of the pak file will be used
-  # by default.
-  parser.add_argument('--pak_base_dir')
   parser.add_argument('--out_folder')
   args = parser.parse_args()
 
-  Unpack(args.pak_file, args.out_folder, args.pak_base_dir)
+  Unpack(args.pak_file, args.out_folder)
 
   timestamp_file_path = os.path.join(args.out_folder, _TIMESTAMP_FILENAME)
   with open(timestamp_file_path, 'a'):

chrome/browser/ui/webui/settings/chromeos/os_settings_ui.cc

@@ -68,10 +68,6 @@ OSSettingsUI::OSSettingsUI(content::WebUI* web_ui)
   html_source->AddResourcePath("chromeos/lazy_load.html",
                                IDR_OS_SETTINGS_LAZY_LOAD_VULCANIZED_HTML);
   html_source->SetDefaultResource(IDR_OS_SETTINGS_VULCANIZED_HTML);
-  html_source->AddResourcePath("chromeos/os_settings_v3.html",
-                               IDR_OS_SETTINGS_OS_SETTINGS_V3_HTML);
-  html_source->AddResourcePath("chromeos/os_settings.js",
-                               IDR_OS_SETTINGS_SETTINGS_ROLLUP_JS);
 #else
   webui::SetupWebUIDataSource(
       html_source,