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

apps/moterm/moterm_driver.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 "apps/moterm/moterm_driver.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
-#include "mojo/services/files/public/interfaces/ioctl.mojom.h"
-#include "mojo/services/files/public/interfaces/ioctl_terminal.mojom.h"
+#include "mojo/services/files/interfaces/ioctl.mojom.h"
+#include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
 
 // Character constants:
 const uint8_t kEOT = 4;
 const uint8_t kNL = 10;
 const uint8_t kCR = 13;
 const uint8_t kDEL = 127;
 
 // Short forms for various counts/indices used for the get/set settings ioctls.
 const size_t kBaseFieldCount = mojo::files::kIoctlTerminalTermiosBaseFieldCount;
 const size_t kTotalFieldCount =
@@ skipping 459 matching lines @@
   }
   if (1 + kVEOFIdx < in_values.size()) {
     uint32_t value = in_values[1 + kVEOFIdx];
     if (value > std::numeric_limits<uint8_t>::max())
       return mojo::files::Error::INVALID_ARGUMENT;
     veof_ = static_cast<uint8_t>(value);
   }
 
   return mojo::files::Error::OK;
 }