Remote Assistance on Chrome OS Part II - Native Messaging renaming

remoting/host/it2me/it2me_native_messaging_host.h

Index: remoting/host/it2me/it2me_native_messaging_host.h
diff --git a/remoting/host/it2me/it2me_native_messaging_host.h b/remoting/host/it2me/it2me_native_messaging_host.h
index 1445872616aabd10738b3d8fff564795ef62b065..08bba22ec31e68d5cc15928287bf046be3caad35 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.h
+++ b/remoting/host/it2me/it2me_native_messaging_host.h
@@ -8,12 +8,13 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/extensions/api/messaging/native_messaging_channel.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/it2me/it2me_host.h"
-#include "remoting/host/native_messaging/native_messaging_channel.h"
 
 namespace base {
 class DictionaryValue;
+class File;

[weitao, 2014/09/12 16:37:36]

Why is this needed?

[kelvinp, 2014/09/12 17:58:32]

Done.

 }  // namespace base
 
 namespace remoting {
@@ -23,7 +24,7 @@ class It2MeNativeMessagingHost : public It2MeHost::Observer {
  public:
   It2MeNativeMessagingHost(
       scoped_refptr<AutoThreadTaskRunner> task_runner,
-      scoped_ptr<NativeMessagingChannel> channel,
+      scoped_ptr<extensions::NativeMessagingChannel> channel,
       scoped_ptr<It2MeHostFactory> factory);
   virtual ~It2MeNativeMessagingHost();
 
@@ -56,7 +57,7 @@ class It2MeNativeMessagingHost : public It2MeHost::Observer {
 
   scoped_refptr<AutoThreadTaskRunner> task_runner() const;
 
-  scoped_ptr<NativeMessagingChannel> channel_;
+  scoped_ptr<extensions::NativeMessagingChannel> channel_;
   scoped_ptr<It2MeHostFactory> factory_;
   scoped_ptr<ChromotingHostContext> host_context_;
   scoped_refptr<It2MeHost> it2me_host_;