Reland: Introduce the devices Mojo app

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 80a60462216f16d040b5f8758872293a41f4f7ec..44f31f2f3902f9385c85917ebf861a86f724446f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -19,6 +19,7 @@
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/browser_about_handler.h"
@@ -123,6 +124,7 @@
 #include "content/public/common/service_registry.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
+#include "device/devices_app/devices_app.h"
 #include "gin/v8_initializer.h"
 #include "net/base/mime_util.h"
 #include "net/cookies/canonical_cookie.h"
@@ -2365,6 +2367,15 @@ void ChromeContentBrowserClient::OverrideRenderFrameMojoServices(
 #endif
 }
 
+void ChromeContentBrowserClient::RegisterMojoApplications(
+    StaticMojoApplicationMap* apps) {
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+  apps->insert(std::make_pair(GURL(device::kDevicesMojoAppUrl),
+                              base::Bind(&device::DevicesApp::CreateDelegate,
+                                         base::ThreadTaskRunnerHandle::Get())));
+#endif
+}
+
 void ChromeContentBrowserClient::OpenURL(
     content::BrowserContext* browser_context,
     const content::OpenURLParams& params,