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

services/dart/content_handler_main.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/dart/embedder/dart_controller.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
 #include "services/dart/content_handler_app_service_connector.h"
 #include "services/dart/dart_app.h"
 #include "services/dart/dart_tracing.h"
 #include "url/gurl.h"
 
 namespace dart {
 
 const char kEnableStrictMode[] = "--enable-strict-mode";
 const char kTraceStartup[] = "--trace-startup";
 
@@ skipping 173 matching lines @@
 
 }  // namespace dart
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp);
   MojoResult r = runner.Run(application_request);
   // TODO(johnmccutchan): Remove this once the Dart VM shuts down threads.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   return r;
 }