It2Me native messaging: GYP and source refactoring

remoting/host/setup/me2me_native_messaging_host.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_HOST_H_
-#define REMOTING_HOST_SETUP_NATIVE_MESSAGING_HOST_H_
+#ifndef REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
+#define REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
+#include "remoting/host/native_messaging/native_messaging_channel.h"
 #include "remoting/host/setup/daemon_controller.h"
-#include "remoting/host/setup/native_messaging_channel.h"
 #include "remoting/host/setup/oauth_client.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }  // namespace base
 
 namespace gaia {
 class GaiaOAuthClient;
 }  // namespace gaia
@@ skipping 120 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtr<NativeMessagingHost> weak_ptr_;
   base::WeakPtrFactory<NativeMessagingHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeMessagingHost);
 };
 
 // Creates a NativeMessagingHost instance, attaches it to stdin/stdout and runs
 // the message loop until NativeMessagingHost signals shutdown.
 int NativeMessagingHostMain();

[Sergey Ulanov, 2013/10/30 22:51:01]

Should this routine be renamed as well?

[weitao, 2013/10/31 17:59:34]

I'll do that as well as renaming the NativeMessagingHost class in my next CL.

On 2013/10/30 22:51:01, Sergey Ulanov wrote:

 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SETUP_NATIVE_MESSAGING_HOST_H_
+#endif  // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_