[CrOS Settings] Move metrics recorder up one directory.

Bug: 1049830
Change-Id: Ic2025f96852abd32cc3a6535face9223873cea34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056263Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: James Hawkins <jhawkins@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741553}

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

@@ -69,6 +69,7 @@ if (optimize_webui) {
 
 group("closure_compile") {
   deps = [
+    ":metrics_recorder",
     ":os_page_visibility",
     ":os_route",
     ":route_origin_behavior",
@@ -79,7 +80,6 @@ group("closure_compile") {
     "google_assistant_page:closure_compile",
     "internet_page:closure_compile",
     "localized_link:closure_compile",
-    "metrics_recorder:closure_compile",
     "multidevice_page:closure_compile",
     "os_a11y_page:closure_compile",
     "os_apps_page:closure_compile",
@@ -123,3 +123,10 @@ js_library("route_origin_behavior") {
     "//ui/webui/resources/js:cr",
   ]
 }
+
+js_library("metrics_recorder") {
+  deps = [
+    "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile",
+    "//ui/webui/resources/js:cr",
+  ]
+}

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

@@ -10,12 +10,12 @@ js_type_check("closure_compile") {
 
 js_library("os_settings_ui") {
   deps = [
+    "..:metrics_recorder",
     "..:os_page_visibility",
     "..:os_route",
     "../..:global_scroll_target_behavior",
     "../..:router",
     "../../prefs",
-    "../metrics_recorder:metrics_recorder",
     "../os_settings_main:os_settings_main",
     "../os_toolbar",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior",

chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.html

@@ -8,7 +8,7 @@
 <link rel="import" href="chrome://resources/html/find_shortcut_behavior.html">
 <link rel="import" href="chrome://resources/html/util.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
-<link rel="import" href="../metrics_recorder/metrics_recorder.html">
+<link rel="import" href="../metrics_recorder.html">
 <link rel="import" href="../os_settings_menu/os_settings_menu.html">
 <link rel="import" href="../os_settings_main/os_settings_main.html">
 <link rel="import" href="../os_toolbar/os_toolbar.html">

chrome/browser/resources/settings/os_settings_resources.grd

@@ -1238,10 +1238,10 @@
                  file="chromeos/personalization_page/wallpaper_browser_proxy.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_METRICS_RECORDER_HTML"
-                 file="chromeos/metrics_recorder/metrics_recorder.html"
+                 file="chromeos/metrics_recorder.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_METRICS_RECORDER_JS"
-                 file="chromeos/metrics_recorder/metrics_recorder.js"
+                 file="chromeos/metrics_recorder.js"
                  type="chrome_html" />
     </structures>
   </release>