It2Me native messaging: GYP and source refactoring

remoting/host/native_messaging/native_messaging_channel.h

 // Copyright 2013 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.
 
-#ifndef REMOTING_HOST_SETUP_NATIVE_MESSAGING_CHANNEL_H_
-#define REMOTING_HOST_SETUP_NATIVE_MESSAGING_CHANNEL_H_
+#ifndef REMOTING_HOST_NATIVE_MESSAGING_NATIVE_MESSAGING_CHANNEL_H_
+#define REMOTING_HOST_NATIVE_MESSAGING_NATIVE_MESSAGING_CHANNEL_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "base/threading/non_thread_safe.h"
-#include "remoting/host/setup/native_messaging_reader.h"
-#include "remoting/host/setup/native_messaging_writer.h"
+#include "remoting/host/native_messaging/native_messaging_reader.h"
+#include "remoting/host/native_messaging/native_messaging_writer.h"
 
 namespace base {
 class DictionaryValue;
 class Value;
 }  // namespace base
 
 namespace remoting {
 
 // Implements reading messages and sending responses across the native messaging
 // host pipe. Delegates processing of received messages to Delegate.
@@ skipping 12 matching lines @@
    public:
     virtual ~Delegate() {}
 
     // Processes a message received from the client app. Invokes |done| to send
     // a response back to the client app.
     virtual void ProcessMessage(scoped_ptr<base::DictionaryValue> message,
                                 const SendResponseCallback& done) = 0;
   };
 
   // Constructs an object taking the ownership of |input| and |output|. Closes
-  // |input| and |output| to prevent the caller frmo using them.
+  // |input| and |output| to prevent the caller from using them.
   NativeMessagingChannel(
       scoped_ptr<Delegate> delegate,
       base::PlatformFile input,
       base::PlatformFile output);
   ~NativeMessagingChannel();
 
   // Starts reading and processing messages.
   void Start(const base::Closure& quit_closure);
 
  private:
@@ skipping 25 matching lines @@
   bool shutdown_;
 
   base::WeakPtr<NativeMessagingChannel> weak_ptr_;
   base::WeakPtrFactory<NativeMessagingChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeMessagingChannel);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SETUP_NATIVE_MESSAGING_CHANNEL_H_
+#endif  // REMOTING_HOST_NATIVE_MESSAGING_NATIVE_MESSAGING_CHANNEL_H_