mandoline filesystem: Compile filesystem into core_services.

This packages the filesystem application physically with the rest of
core_services.

BUG=490237

Review URL: https://codereview.chromium.org/1167693009

Cr-Commit-Position: refs/heads/master@{#332504}

5 files changed, 11 insertions, 7 deletions

diff --git a/mandoline/BUILD.gn b/mandoline/BUILD.gn
index 2bcd2e6..1749e490 100644
--- a/mandoline/BUILD.gn
+++ b/mandoline/BUILD.gn
@@ -11,10 +11,7 @@ group("all") {
   ]
 
   if (!is_component_build) {
-    deps += [
-      "//mandoline/app",
-      "//components/filesystem",
-    ]
+    deps += [ "//mandoline/app" ]
   }
 }
 
diff --git a/mandoline/app/core_services_initialization.cc b/mandoline/app/core_services_initialization.cc
index 8fbb3f9..7e9fde8 100644
--- a/mandoline/app/core_services_initialization.cc
+++ b/mandoline/app/core_services_initialization.cc
@@ -14,6 +14,8 @@ void InitCoreServicesForContext(mojo::runner::Context* context) {
   mojo::shell::ApplicationManager* manager = context->application_manager();
   manager->RegisterApplicationPackageAlias(GURL("mojo:clipboard"),
                                            GURL("mojo:core_services"), "Core");
+  manager->RegisterApplicationPackageAlias(GURL("mojo:filesystem"),
+                                           GURL("mojo:core_services"), "Files");
 #if !defined(OS_ANDROID)
   manager->RegisterApplicationPackageAlias(GURL("mojo:view_manager"),
                                            GURL("mojo:core_services"),
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn
index 3964619..92899364 100644
--- a/mandoline/services/core_services/BUILD.gn
+++ b/mandoline/services/core_services/BUILD.gn
@@ -64,6 +64,7 @@ source_set("sources") {
   deps = [
     "//base",
     "//components/clipboard:lib",
+    "//components/filesystem:lib",
     "//components/resource_provider:lib",
     "//components/view_manager:lib",
     "//components/view_manager/surfaces:lib",
diff --git a/mandoline/services/core_services/DEPS b/mandoline/services/core_services/DEPS
index afc9210..308fa909 100644
--- a/mandoline/services/core_services/DEPS
+++ b/mandoline/services/core_services/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+components/clipboard",
+  "+components/filesystem",
   "+components/resource_provider",
   "+components/view_manager",
   "+mojo/application",
diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc
index c80830b..c1ca150 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "components/clipboard/clipboard_application_delegate.h"
+#include "components/filesystem/file_system_app.h"
 #include "components/resource_provider/resource_provider_app.h"
 #include "components/view_manager/surfaces/surfaces_service_application.h"
 #include "components/view_manager/view_manager_app.h"
@@ -157,8 +158,12 @@ void CoreServicesApplicationDelegate::StartApplication(
   std::string url = response->url;
 
   scoped_ptr<mojo::ApplicationDelegate> delegate;
-  if (url == "mojo://clipboard/")
+  if (url == "mojo://browser/")
+    delegate.reset(new mandoline::Browser);
+  else if (url == "mojo://clipboard/")
     delegate.reset(new clipboard::ClipboardApplicationDelegate);
+  else if (url == "mojo://filesystem_service/")
+    delegate.reset(new filesystem::FileSystemApp);
   else if (url == "mojo://network_service/")
     delegate.reset(new NetworkServiceDelegate);
 #if !defined(OS_ANDROID)
@@ -173,8 +178,6 @@ void CoreServicesApplicationDelegate::StartApplication(
     delegate.reset(new tracing::TracingApp);
   else if (url == "mojo://view_manager/")
     delegate.reset(new view_manager::ViewManagerApp);
-  else if (url == "mojo://browser/")
-    delegate.reset(new mandoline::Browser);
   else
     NOTREACHED() << "This application package does not support " << url;