Restructure public side of content_handler service.

mojo/application_manager/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("//mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: mojo.gyp:mojo_application_manager
 component("application_manager") {
   output_name = "mojo_application_manager"
   sources = [
@@ skipping 15 matching lines @@
     "//mojo/services/network/public/interfaces",
     "//url",
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
     "//url",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/public/interfaces/content_handler:content_handler",
+    "//mojo/services/content_handler/public/interfaces",
   ]
 }
 
 # GYP version: mojo.gyp:mojo_application_manager_unittests
 test("mojo_application_manager_unittests") {
   sources = [
     "application_manager_unittest.cc",
     "background_shell_application_loader_unittest.cc",
   ]
 
   deps = [
     ":application_manager",
     ":test_bindings",
     "//base",
     "//mojo/application",
     "//mojo/common",
     "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//testing/gtest",
     "//url",
   ]
 }
 
 mojom("test_bindings") {
   sources = [
     "test.mojom",
   ]
 }