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

mojo/services/files/cpp/input_stream_file.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.
 
 // This is a helper class for implementing a |mojo::files::File| that behaves
 // like an "input stream" ("input" from the point of view of the client --
 // i.e., the client can write/stream input from it, but not write or seek).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_CPP_INPUT_STREAM_FILE_H_
-#define MOJO_SERVICES_FILES_PUBLIC_CPP_INPUT_STREAM_FILE_H_
+#ifndef MOJO_SERVICES_FILES_CPP_INPUT_STREAM_FILE_H_
+#define MOJO_SERVICES_FILES_CPP_INPUT_STREAM_FILE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 #include <memory>
 
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/macros.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"
 
 namespace files_impl {
 
 class InputStreamFile : public mojo::files::File {
  public:
   // The |Client| receives data written to the stream "file" as well as other
   // notifications (e.g., of the "file" being closed). From any of the methods
   // below, the client may choose to destroy the |InputStreamFile|.
   class Client {
    public:
@@ skipping 114 matching lines @@
   // If non-null |*was_destroyed_| is set to true on destruction.
   bool* was_destroyed_;
 
   mojo::Binding<mojo::files::File> binding_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(InputStreamFile);
 };
 
 }  // namespace files_impl
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_CPP_INPUT_STREAM_FILE_H_
+#endif  // MOJO_SERVICES_FILES_CPP_INPUT_STREAM_FILE_H_