Navi: Remove 'onboarding_welcome' folder from c/b/r/welcome.

Bug: 973686
Change-Id: I7e2b6696785e9009d9a8904ed87105c281d34b1a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715966Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680480}

chrome/browser/resources/BUILD.gn

@@ -30,7 +30,7 @@ if (closure_compile) {
         "settings:closure_compile",
         "signin/sync_confirmation:closure_compile",
         "user_manager:closure_compile",
-        "welcome/onboarding_welcome:closure_compile",
+        "welcome:closure_compile",
       ]
     }
     if (is_chromeos) {
@@ -219,7 +219,7 @@ if (is_chromeos) {
 
 if (!is_android && !is_chromeos) {
   grit("onboarding_welcome_resources") {
-    source = "welcome/onboarding_welcome/onboarding_welcome_resources.grd"
+    source = "welcome/onboarding_welcome_resources.grd"
 
     defines = chrome_grit_defines
     outputs = [

chrome/browser/resources/welcome/onboarding_welcome/shared/nux_types.js → chrome/browser/resources/welcome/shared/nux_types.js

@@ -24,7 +24,7 @@ welcome.stepIndicatorModel;
 
 /**
  * TODO(hcarmona): somehow reuse from
- * chrome/browser/resources/settings/default_browser_page/default_browser_browser_proxy.js
+ * c/b/r/s/default_browser_page/default_browser_browser_proxy.js
  * @typedef {{
  *   canBeDefault: boolean,
  *   isDefault: boolean,

chrome/browser/resources/welcome/onboarding_welcome/welcome_browser_proxy.js → chrome/browser/resources/welcome/welcome_browser_proxy.js

@@ -8,7 +8,6 @@
  */
 
 cr.define('welcome', function() {
-
   /** @interface */
   class WelcomeBrowserProxy {
     /** @param {?string} redirectUrl the URL to go to, after signing in. */

tools/gritsettings/resource_ids

@@ -152,7 +152,7 @@
   "chrome/browser/resources/webapks/webapks_ui_resources.grd": {
     "includes": [13890],
   },
-  "chrome/browser/resources/welcome/onboarding_welcome/onboarding_welcome_resources.grd": {
+  "chrome/browser/resources/welcome/onboarding_welcome_resources.grd": {
     "includes": [13900],
     "structures": [13950],
   },