Revert of Sandbox html_viewer on Linux.

mandoline/services/core_services/core_services_application_delegate.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mandoline/services/core_services/core_services_application_delegate.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/simple_thread.h"
 #include "components/clipboard/clipboard_application_delegate.h"
@@ skipping 10 matching lines @@
 #if defined(USE_AURA)
 #include "mandoline/ui/omnibox/omnibox_impl.h"
 #endif
 
 #if !defined(OS_ANDROID)
 #include "components/resource_provider/resource_provider_app.h"
 #include "components/view_manager/view_manager_app.h"
 #include "mojo/services/network/network_service_delegate.h"
 #endif
 
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
-#include "components/font_service/font_service_app.h"
-#endif
-
 namespace core_services {
 
 // A helper class for hosting a mojo::ApplicationImpl on its own thread.
 class ApplicationThread : public base::SimpleThread {
  public:
   ApplicationThread(
       const base::WeakPtr<CoreServicesApplicationDelegate>
           core_services_application,
       const std::string& url,
       scoped_ptr<mojo::ApplicationDelegate> delegate,
@@ skipping 82 matching lines @@
     mojo::URLResponsePtr response) {
   std::string url = response->url;
 
   scoped_ptr<mojo::ApplicationDelegate> delegate;
   if (url == "mojo://browser/") {
     delegate.reset(new mandoline::BrowserManager);
   } else if (url == "mojo://clipboard/") {
     delegate.reset(new clipboard::ClipboardApplicationDelegate);
   } else if (url == "mojo://filesystem/") {
     delegate.reset(new filesystem::FileSystemApp);
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
-  } else if (url == "mojo://font_service/") {
-    delegate.reset(new font_service::FontServiceApp);
-#endif
   } else if (url == "mojo://surfaces_service/") {
     delegate.reset(new surfaces::SurfacesServiceApplication);
   } else if (url == "mojo://tracing/") {
     delegate.reset(new tracing::TracingApp);
 #if defined(USE_AURA)
   } else if (url == "mojo://omnibox/") {
     delegate.reset(new mandoline::OmniboxImpl);
 #endif
 #if !defined(OS_ANDROID)
   } else if (url == "mojo://network_service/") {
     delegate.reset(new mojo::NetworkServiceDelegate);
   } else if (url == "mojo://resource_provider/") {
     delegate.reset(
         new resource_provider::ResourceProviderApp("mojo:core_services"));
   } else if (url == "mojo://view_manager/") {
     delegate.reset(new view_manager::ViewManagerApp);
 #endif
   } else {
     NOTREACHED() << "This application package does not support " << url;
   }
 
   scoped_ptr<ApplicationThread> thread(
       new ApplicationThread(weak_factory_.GetWeakPtr(), url, delegate.Pass(),
                             request.Pass()));
   thread->Start();
   application_threads_.push_back(thread.Pass());
 }
 
 }  // namespace core_services