| Index: chrome/common/service_messages_internal.h | 
| diff --git a/chrome/common/service_messages_internal.h b/chrome/common/service_messages_internal.h | 
| index e5ae7b35b7e7279fb1cf569b6f502685cd3cbe80..94a0215a70b7265dfdddad3729887fdcbbdd0af1 100644 | 
| --- a/chrome/common/service_messages_internal.h | 
| +++ b/chrome/common/service_messages_internal.h | 
| @@ -6,6 +6,8 @@ | 
|  | 
| #include "ipc/ipc_message_macros.h" | 
|  | 
| +#include "chrome/common/remoting/chromoting_host_info.h" | 
| + | 
| #define IPC_MESSAGE_START ServiceMsgStart | 
|  | 
| //------------------------------------------------------------------------------ | 
| @@ -30,11 +32,19 @@ IPC_MESSAGE_CONTROL0(ServiceMsg_IsCloudPrintProxyEnabled) | 
| // This message is for testing purpose. | 
| IPC_MESSAGE_CONTROL0(ServiceMsg_Hello) | 
|  | 
| -// This message is for enabling the remoting process. | 
| -IPC_MESSAGE_CONTROL3(ServiceMsg_EnableRemotingWithTokens, | 
| +// Set credentials used by the RemotingHost. | 
| +IPC_MESSAGE_CONTROL2(ServiceMsg_SetRemotingHostCredentials, | 
| std::string, /* username */ | 
| -                     std::string, /* Token for remoting */ | 
| -                     std::string  /* Token for Google Talk */) | 
| +                     std::string  /* token for XMPP */) | 
| + | 
| +// Enabled remoting host. | 
| +IPC_MESSAGE_CONTROL0(ServiceMsg_EnableRemotingHost) | 
| + | 
| +// Disable remoting host. | 
| +IPC_MESSAGE_CONTROL0(ServiceMsg_DisableRemotingHost) | 
| + | 
| +// Get remoting host status information. | 
| +IPC_MESSAGE_CONTROL0(ServiceMsg_GetRemotingHostInfo) | 
|  | 
| // Tell the service process to shutdown. | 
| IPC_MESSAGE_CONTROL0(ServiceMsg_Shutdown) | 
| @@ -53,5 +63,8 @@ IPC_MESSAGE_CONTROL2(ServiceHostMsg_CloudPrintProxy_IsEnabled, | 
| bool,       /* Is the proxy enabled? */ | 
| std::string /* Email address of account */) | 
|  | 
| +IPC_MESSAGE_CONTROL1(ServiceHostMsg_RemotingHost_HostInfo, | 
| +                     remoting::ChromotingHostInfo /* host_info */) | 
| + | 
| // Sent from the service process in response to a Hello message. | 
| IPC_MESSAGE_CONTROL0(ServiceHostMsg_GoodDay) | 
|  |