[Cross Device] Enable os:// URLs on LaCros for debugging
Adds proximity-auth, nearby-internals, and multidevice-internals to the
list of chrome:// URLs that can be forwarded from LaCros to Ash (os://)
Fixed: b/224856185
Test: Verified on DUT
Change-Id: Ib0711ff77e4bbc0038a48ba70ad5430cb674b400
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3751406
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Juliet Lévesque <julietlevesque@google.com>
Cr-Commit-Position: refs/heads/main@{#1024370}
diff --git a/ash/webui/multidevice_debug/url_constants.cc b/ash/webui/multidevice_debug/url_constants.cc
index 168ef0714..3b91d850 100644
--- a/ash/webui/multidevice_debug/url_constants.cc
+++ b/ash/webui/multidevice_debug/url_constants.cc
@@ -10,6 +10,7 @@
const char kChromeUIProximityAuthHost[] = "proximity-auth";
const char kChromeUIProximityAuthURL[] = "chrome://proximity-auth/";
+const char kOsUIProximityAuthURL[] = "os://proximity-auth";
} // namespace multidevice
diff --git a/ash/webui/multidevice_debug/url_constants.h b/ash/webui/multidevice_debug/url_constants.h
index ccf60aa..2d96978d 100644
--- a/ash/webui/multidevice_debug/url_constants.h
+++ b/ash/webui/multidevice_debug/url_constants.h
@@ -11,6 +11,7 @@
extern const char kChromeUIProximityAuthHost[];
extern const char kChromeUIProximityAuthURL[];
+extern const char kOsUIProximityAuthURL[];
} // namespace multidevice
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 32d39af..375d8fcc5 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -1593,6 +1593,12 @@
GURL(chrome::kChromeUIPowerUrl),
GURL(chrome::kChromeUIPrintManagementUrl),
GURL(ash::multidevice::kChromeUIProximityAuthURL),
+ GURL(ash::multidevice::kOsUIProximityAuthURL),
+ GURL(chrome::kChromeUINearbyInternalsURL),
+ GURL(chrome::kOsUINearbyInternalsURL),
+ GURL(chrome::kChromeUIMultiDeviceInternalsURL),
+ GURL(chrome::kOsUIMultiDeviceInternalsURL),
+ GURL(chrome::kOsUIRestartURL),
GURL(chrome::kChromeUIScanningAppURL),
GURL(chrome::kOsUIConnectivityDiagnosticsAppURL),
GURL(chrome::kOsUIDiagnosticsAppURL),
diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
index 1d2cb98..dc6e56b 100644
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -243,6 +243,7 @@
#else
const char kChromeUIAppServiceInternalsHost[] = "app-service-internals";
const char kChromeUINearbyInternalsHost[] = "nearby-internals";
+const char kChromeUINearbyInternalsURL[] = "chrome://nearby-internals";
const char kChromeUIBookmarksSidePanelHost[] =
"bookmarks-side-panel.top-chrome";
const char kChromeUIBookmarksSidePanelURL[] =
@@ -330,6 +331,8 @@
const char kChromeUIMobileSetupHost[] = "mobilesetup";
const char kChromeUIMobileSetupURL[] = "chrome://mobilesetup/";
const char kChromeUIMultiDeviceInternalsHost[] = "multidevice-internals";
+const char kChromeUIMultiDeviceInternalsURL[] =
+ "chrome://multidevice-internals";
const char kChromeUIMultiDeviceSetupHost[] = "multidevice-setup";
const char kChromeUIMultiDeviceSetupUrl[] = "chrome://multidevice-setup";
const char kChromeUINetworkHost[] = "network";
@@ -391,6 +394,8 @@
const char kOsUIHistogramsURL[] = "os://histograms";
const char kOsUIInvalidationsURL[] = "os://invalidations";
const char kOsUILockScreenNetworkURL[] = "os://lock-network";
+const char kOsUIMultiDeviceInternalsURL[] = "os://multidevice-internals";
+const char kOsUINearbyInternalsURL[] = "os://nearby-internals";
const char kOsUINetworkURL[] = "os://network";
const char kOsUINetExportURL[] = "os://net-export";
const char kOsUIRestartURL[] = "os://restart";
diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
index b45428c..3fc2ab5 100644
--- a/chrome/common/webui_url_constants.h
+++ b/chrome/common/webui_url_constants.h
@@ -232,6 +232,7 @@
#else
extern const char kChromeUIAppServiceInternalsHost[];
extern const char kChromeUINearbyInternalsHost[];
+extern const char kChromeUINearbyInternalsURL[];
extern const char kChromeUIBookmarksSidePanelHost[];
extern const char kChromeUIBookmarksSidePanelURL[];
extern const char kChromeUICustomizeChromeSidePanelHost[];
@@ -308,6 +309,7 @@
extern const char kChromeUIMobileSetupHost[];
extern const char kChromeUIMobileSetupURL[];
extern const char kChromeUIMultiDeviceInternalsHost[];
+extern const char kChromeUIMultiDeviceInternalsURL[];
extern const char kChromeUIMultiDeviceSetupHost[];
extern const char kChromeUIMultiDeviceSetupUrl[];
extern const char kChromeUINetworkHost[];
@@ -365,6 +367,8 @@
extern const char kOsUIInvalidationsURL[];
extern const char kOsUILockScreenNetworkURL[];
extern const char kOsUINetExportURL[];
+extern const char kOsUIMultiDeviceInternalsURL[];
+extern const char kOsUINearbyInternalsURL[];
extern const char kOsUINetworkURL[];
extern const char kOsUIRestartURL[];
extern const char kOsUISettingsURL[];