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/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.