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

shell/android/main.cc

 // Copyright 2013 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 "shell/android/main.h"
 
 #include <stdio.h>
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task_runner_util.h"
 #include "base/threading/simple_thread.h"
 #include "gpu/config/gpu_util.h"
 #include "jni/ShellService_jni.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
 #include "shell/android/android_handler_loader.h"
 #include "shell/android/java_application_loader.h"
 #include "shell/android/native_viewport_application_loader.h"
 #include "shell/android/ui_application_loader_android.h"
 #include "shell/android/url_response_disk_cache_delegate_impl.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/background_application_loader.h"
 #include "shell/command_line_util.h"
 #include "shell/context.h"
 #include "shell/crash/breakpad.h"
@@ skipping 301 matching lines @@
                      mojo::MessagePipeHandle(services_handle))),
                  base::Passed(mojo::ScopedMessagePipeHandle(
                      mojo::MessagePipeHandle(exposed_services_handle)))));
 }
 
 bool RegisterShellService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell