Mandoline: Move content_handler.mojom from third_party/ to mojo/.

mojo.ContentHandler is a core thing used by the shell, and thus should
be part of the Application interface. This should enable further
refactoring.

BUG=

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

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

components/html_viewer/BUILD.gn

@@ -137,7 +137,6 @@ source_set("lib") {
     "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
     "//third_party/mojo/src/mojo/public/cpp/utility",
     "//third_party/mojo_services/src/accessibility/public/interfaces",
-    "//third_party/mojo_services/src/content_handler/public/interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/events",
     "//ui/events:gesture_detection",

components/html_viewer/html_document.h

@@ -19,12 +19,12 @@
 #include "mojo/application/public/cpp/lazy_interface_ptr.h"
 #include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace base {
 class MessageLoopProxy;

components/html_viewer/html_viewer.cc

@@ -17,12 +17,12 @@
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/cpp/interface_factory_impl.h"
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 using mojo::ApplicationConnection;
 using mojo::Array;

mandoline/services/core_services/BUILD.gn

@@ -72,7 +72,6 @@ source_set("sources") {
     "//mojo/services/network:lib",
     "//mojo/services/tracing:lib",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo_services/src/content_handler/public/interfaces",
   ]
 
   if (!is_android) {

mandoline/services/core_services/core_services_application_delegate.h

@@ -11,8 +11,8 @@
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/interface_factory_impl.h"
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace core_services {
 

mojo/application/BUILD.gn

@@ -30,7 +30,6 @@ source_set("content_handler") {
     "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//third_party/mojo_services/src/content_handler/public/interfaces",
     "//mojo/services/network/public/interfaces",
   ]
 }

mojo/application/content_handler_factory.h

@@ -7,9 +7,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 

mojo/application/public/interfaces/BUILD.gn

@@ -2,13 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/module_args/mojo.gni")
+import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: mojo/mojo_base.gyp:mojo_application_bindings
 mojom("interfaces") {
   sources = [
     "application.mojom",
+    "content_handler.mojom",
     "service_provider.mojom",
     "shell.mojom",
   ]
+
+  import_dirs = [ mojo_network_service_root ]
+
+  deps = [
+    "//mojo/services/network/public/interfaces",
+  ]
 }

mojo/runner/android/android_handler.h

@@ -10,7 +10,7 @@
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/interface_factory_impl.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 
 namespace base {
 class FilePath;

mojo/shell/BUILD.gn

@@ -45,7 +45,6 @@ source_set("shell") {
     "//third_party/mojo/src/mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/util:filename_util",
-    "//third_party/mojo_services/src/content_handler/public/interfaces",
   ]
 }
 

mojo/shell/application_manager.cc

@@ -11,6 +11,7 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/shell/fetcher.h"
@@ -19,7 +20,6 @@
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/shell_impl.h"
 #include "mojo/shell/switches.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace shell {

mojo/shell/shell_impl.cc

@@ -4,10 +4,10 @@
 
 #include "mojo/shell/shell_impl.h"
 
+#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
-#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace shell {

third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn

-# Copyright 2014 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.
-
-import("//build/module_args/mojo.gni")
-import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
-
-mojom("interfaces") {
-  sources = [
-    "content_handler.mojom",
-  ]
-
-  import_dirs = [ get_path_info("../../../", "abspath") ]
-
-  if (defined(mojo_network_service_root)) {
-    import_dirs += [ mojo_network_service_root ]
-  } else {
-    mojo_network_service_root = "../../.."
-  }
-
-  deps = [
-    "$mojo_network_service_root/network/public/interfaces",
-    "//mojo/application/public/interfaces",
-  ]
-}