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

apps/moterm/moterm_driver.h

 // 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.
 
 // |MotermDriver| is a class providing a |mojo.files.File| interface,
 // implementing termios-type features (e.g., line editing; TODO(vtl): lots to do
 // here), and appropriately processing bytes to/from the terminal (which gets
 // and sends "raw" data). In essence, this class includes what would
 // traditionally be called the terminal driver in a Unix kernel.
 
 #ifndef APPS_MOTERM_MOTERM_DRIVER_H_
 #define APPS_MOTERM_MOTERM_DRIVER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.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"
 
 // TODO(vtl): Maybe we should Mojo-fy the driver and run it as a separate app?
 class MotermDriver : public mojo::files::File {
  public:
   // The |Client| is basically the terminal implementation itself, to which
   // processed output (from an application, to the "file", through the driver)
   // is sent. It also receives other notifications (e.g., when the "file" is
   // closed or otherwise "broken").
   class Client {
    public:
@@ skipping 133 matching lines @@
   // Output settings:
   // If true, will convert output CRs to CR-NL pairs.
   bool onlcr_;
 
   base::WeakPtrFactory<MotermDriver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MotermDriver);
 };
 
 #endif  // APPS_MOTERM_MOTERM_DRIVER_H_