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

examples/echo_terminal/main.cc

 // Copyright 2015 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/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/binding_set.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
 
 const uint32_t kMaxBytesToRead = 1000;
 
 // Owns itself.
 class TerminalEchoer {
  public:
   explicit TerminalEchoer(mojo::files::FilePtr terminal)
       : terminal_(terminal.Pass()), last_bytes_read_size_(0) {
     terminal_.set_connection_error_handler([this]() { OnConnectionError(); });
@@ skipping 99 matching lines @@
 
   mojo::BindingSet<mojo::terminal::TerminalClient> terminal_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp);
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new EchoTerminalApp());
   return runner.Run(application_request);
 }