Move //mojo/services/X/public/... to //mojo/services/X/... (part 3).

X = navigation,
    nfc,
    notifications,
    ozone_drm_gpu,
    ozone_drm_host,
    prediction,
    sensors,
    service_registry,
    sharing,
    speech_recognizer,
    surfaces,
    terminal,
    tracing,
    url_response_disk_cache

(Skipped network.)

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1394303004 .
diff --git a/apps/benchmark/BUILD.gn b/apps/benchmark/BUILD.gn
index 5bb84bb..220f763 100644
--- a/apps/benchmark/BUILD.gn
+++ b/apps/benchmark/BUILD.gn
@@ -22,7 +22,7 @@
   ]
 
   public_deps = [
-    "//mojo/services/tracing/public/interfaces",
+    "//mojo/services/tracing/interfaces",
   ]
 }
 
diff --git a/apps/benchmark/README.md b/apps/benchmark/README.md
index 8380939..8f84f22 100644
--- a/apps/benchmark/README.md
+++ b/apps/benchmark/README.md
@@ -4,7 +4,7 @@
 indicated period of time and computes a number of results based on the collected
 traces. It can be used to measure performance of a mojo app, provided that the
 app being benchmarked participates in the [tracing
-ecosystem](../../mojo/services/tracing/public/interfaces/tracing.mojom).
+ecosystem](../../mojo/services/tracing/interfaces/tracing.mojom).
 
 ## Arguments
 
diff --git a/apps/benchmark/benchmark_app.cc b/apps/benchmark/benchmark_app.cc
index bd7c8a9..bfdc299 100644
--- a/apps/benchmark/benchmark_app.cc
+++ b/apps/benchmark/benchmark_app.cc
@@ -24,7 +24,7 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
 
 namespace benchmark {
 namespace {
diff --git a/apps/benchmark/trace_collector_client.h b/apps/benchmark/trace_collector_client.h
index 3e5ba37..6c9bedb 100644
--- a/apps/benchmark/trace_collector_client.h
+++ b/apps/benchmark/trace_collector_client.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/data_pipe_utils/data_pipe_drainer.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
 
 // Connects to trace collector in tracing.mojo to get traces and returns the
 // results as a single string to the receiver.