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

apps/moterm/moterm_driver_unittest.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 <deque>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/type_converter.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // A test |MotermDriver::Client| that just records the notifications it
 // receives. When |OnDestroyed()| gets called, it'll also quit the current
 // message loop.
 class TestClient : public MotermDriver::Client {
  public:
   struct Event {
@@ skipping 245 matching lines @@
   // Here, detach rather than doing destroying the other end.
   // TODO(vtl): Verify that the driver's end of the message pipe is closed
   // (e.g., by checking that |file| detects that its peer is closed).
   driver->Detach();
   EXPECT_FALSE(driver);
   // The client shouldn't have received anything.
   EXPECT_TRUE(client.events().empty());
 }
 
 }  // namespace