Remove remoting/jingle_glue

Moved all files from remoting/jingle_glue to remoting/signaling and
remoting/protocol.
The new remoting/signaling directory contains signaling layer implementation
for remoting that can be used independently of remoting/protocol.

TBR=rch@chromium.org

Review URL: https://codereview.chromium.org/390983003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283654 0039d316-1c4b-4281-b951-d872f2087c98

81 files changed, 225 insertions, 206 deletions

diff --git a/remoting/client/DEPS b/remoting/client/DEPS
index 3dc689a..3eed1d8 100644
--- a/remoting/client/DEPS
+++ b/remoting/client/DEPS
@@ -6,5 +6,5 @@ include_rules = [
 
   "+remoting/codec",
   "+remoting/protocol",
-  "+remoting/jingle_glue",
+  "+remoting/signaling",
 ]
diff --git a/remoting/client/client_status_logger.h b/remoting/client/client_status_logger.h
index 49ed774..afc64b9 100644
--- a/remoting/client/client_status_logger.h
+++ b/remoting/client/client_status_logger.h
@@ -7,9 +7,9 @@
 
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
-#include "remoting/jingle_glue/log_to_server.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/errors.h"
+#include "remoting/signaling/log_to_server.h"
 
 namespace remoting {
 
diff --git a/remoting/client/client_status_logger_unittest.cc b/remoting/client/client_status_logger_unittest.cc
index 0bda85a..7f5a286 100644
--- a/remoting/client/client_status_logger_unittest.cc
+++ b/remoting/client/client_status_logger_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "remoting/client/chromoting_stats.h"
-#include "remoting/jingle_glue/mock_objects.h"
-#include "remoting/jingle_glue/server_log_entry_unittest.h"
+#include "remoting/signaling/mock_signal_strategy.h"
+#include "remoting/signaling/server_log_entry_unittest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc
index eaabdf4..ce7935d 100644
--- a/remoting/client/jni/chromoting_jni_instance.cc
+++ b/remoting/client/jni/chromoting_jni_instance.cc
@@ -17,13 +17,13 @@
 #include "remoting/client/jni/chromoting_jni_runtime.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/client/token_fetcher_proxy.h"
-#include "remoting/jingle_glue/chromium_port_allocator.h"
-#include "remoting/jingle_glue/chromium_socket_factory.h"
-#include "remoting/jingle_glue/network_settings.h"
-#include "remoting/jingle_glue/server_log_entry.h"
+#include "remoting/protocol/chromium_port_allocator.h"
+#include "remoting/protocol/chromium_socket_factory.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 #include "remoting/protocol/negotiating_client_authenticator.h"
+#include "remoting/protocol/network_settings.h"
+#include "remoting/signaling/server_log_entry.h"
 
 namespace remoting {
 
@@ -376,12 +376,13 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
                              signaling_.get(),
                              ServiceUrls::GetInstance()->directory_bot_jid()));
 
-  NetworkSettings network_settings(NetworkSettings::NAT_TRAVERSAL_FULL);
+  protocol::NetworkSettings network_settings(
+      protocol::NetworkSettings::NAT_TRAVERSAL_FULL);
 
   // Use Chrome's network stack to allocate ports for peer-to-peer channels.
-  scoped_ptr<ChromiumPortAllocator> port_allocator(
-      ChromiumPortAllocator::Create(jni_runtime_->url_requester(),
-                                    network_settings));
+  scoped_ptr<protocol::ChromiumPortAllocator> port_allocator(
+      protocol::ChromiumPortAllocator::Create(jni_runtime_->url_requester(),
+                                              network_settings));
 
   scoped_ptr<protocol::TransportFactory> transport_factory(
       new protocol::LibjingleTransportFactory(
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index f7067f0..a02cd76 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -16,9 +16,9 @@
 #include "remoting/client/client_user_interface.h"
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/jni/jni_frame_consumer.h"
-#include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/cursor_shape_stub.h"
+#include "remoting/signaling/xmpp_signal_strategy.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index e63da8a..2e40117 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -753,7 +753,8 @@ void ChromotingInstance::HandleConnect(const base::DictionaryValue& data) {
           signal_strategy_.get(),
           PepperPortAllocator::Create(this)
               .PassAs<cricket::HttpPortAllocatorBase>(),
-          NetworkSettings(NetworkSettings::NAT_TRAVERSAL_FULL)));
+          protocol::NetworkSettings(
+              protocol::NetworkSettings::NAT_TRAVERSAL_FULL)));
 
   // Create Authenticator.
   scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
diff --git a/remoting/client/plugin/delegating_signal_strategy.h b/remoting/client/plugin/delegating_signal_strategy.h
index f22539a..276dd65 100644
--- a/remoting/client/plugin/delegating_signal_strategy.h
+++ b/remoting/client/plugin/delegating_signal_strategy.h
@@ -7,7 +7,7 @@
 
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace base {
 class SingleThreadTaskRunner;
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc
index 6d96066..6669266 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.cc
+++ b/remoting/client/plugin/pepper_packet_socket_factory.cc
@@ -12,7 +12,7 @@
 #include "ppapi/cpp/udp_socket.h"
 #include "ppapi/utility/completion_callback_factory.h"
 #include "remoting/client/plugin/pepper_util.h"
-#include "remoting/jingle_glue/socket_util.h"
+#include "remoting/protocol/socket_util.h"
 #include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 
 namespace remoting {
diff --git a/remoting/client/server_log_entry_client.cc b/remoting/client/server_log_entry_client.cc
index f664f8f..981d108 100644
--- a/remoting/client/server_log_entry_client.cc
+++ b/remoting/client/server_log_entry_client.cc
@@ -9,7 +9,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "remoting/client/chromoting_stats.h"
-#include "remoting/jingle_glue/server_log_entry.h"
+#include "remoting/signaling/server_log_entry.h"
 
 using base::StringPrintf;
 using base::SysInfo;
diff --git a/remoting/client/server_log_entry_client_unittest.cc b/remoting/client/server_log_entry_client_unittest.cc
index 9861b18..148acfe9 100644
--- a/remoting/client/server_log_entry_client_unittest.cc
+++ b/remoting/client/server_log_entry_client_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/sys_info.h"
 #include "remoting/client/chromoting_stats.h"
 #include "remoting/client/server_log_entry_client.h"
-#include "remoting/jingle_glue/server_log_entry.h"
-#include "remoting/jingle_glue/server_log_entry_unittest.h"
+#include "remoting/signaling/server_log_entry.h"
+#include "remoting/signaling/server_log_entry_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
diff --git a/remoting/host/DEPS b/remoting/host/DEPS
index 90d75ca..382360c 100644
--- a/remoting/host/DEPS
+++ b/remoting/host/DEPS
@@ -2,8 +2,8 @@ include_rules = [
   "+jingle/glue",
   "+net",
   "+remoting/codec",
-  "+remoting/jingle_glue",
   "+remoting/protocol",
+  "+remoting/signaling",
   "+third_party/jsoncpp",
   "+third_party/modp_b64",
   "+third_party/npapi",
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index 5ebe051..b870b5f 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -13,11 +13,11 @@
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/host/screen_capturer_fake.h"
-#include "remoting/jingle_glue/mock_objects.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index 61b9370..de7b414 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -15,9 +15,9 @@
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/host/server_log_entry_host.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/server_log_entry.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/server_log_entry.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h
index 36338a0..e472e5b 100644
--- a/remoting/host/heartbeat_sender.h
+++ b/remoting/host/heartbeat_sender.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "remoting/base/rsa_key_pair.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index b1a00d6f..8af1d62 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -14,8 +14,8 @@
 #include "remoting/base/constants.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/base/test_rsa_key_pair.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
diff --git a/remoting/host/host_change_notification_listener.cc b/remoting/host/host_change_notification_listener.cc
index 2c5b88b..c6cab8f 100644
--- a/remoting/host/host_change_notification_listener.cc
+++ b/remoting/host/host_change_notification_listener.cc
@@ -10,7 +10,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
diff --git a/remoting/host/host_change_notification_listener.h b/remoting/host/host_change_notification_listener.h
index ae1ba0e..52e91b5 100644
--- a/remoting/host/host_change_notification_listener.h
+++ b/remoting/host/host_change_notification_listener.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/remoting/host/host_change_notification_listener_unittest.cc b/remoting/host/host_change_notification_listener_unittest.cc
index 4e1d715..9f40668 100644
--- a/remoting/host/host_change_notification_listener_unittest.cc
+++ b/remoting/host/host_change_notification_listener_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
diff --git a/remoting/host/host_status_logger.cc b/remoting/host/host_status_logger.cc
index 1910bd3..48fe643 100644
--- a/remoting/host/host_status_logger.cc
+++ b/remoting/host/host_status_logger.cc
@@ -9,8 +9,8 @@
 #include "remoting/base/constants.h"
 #include "remoting/host/host_status_monitor.h"
 #include "remoting/host/server_log_entry_host.h"
-#include "remoting/jingle_glue/server_log_entry.h"
 #include "remoting/protocol/transport.h"
+#include "remoting/signaling/server_log_entry.h"
 
 namespace remoting {
 
diff --git a/remoting/host/host_status_logger.h b/remoting/host/host_status_logger.h
index b4e3869..919cc53 100644
--- a/remoting/host/host_status_logger.h
+++ b/remoting/host/host_status_logger.h
@@ -10,8 +10,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/host/host_status_observer.h"
-#include "remoting/jingle_glue/log_to_server.h"
 #include "remoting/protocol/transport.h"
+#include "remoting/signaling/log_to_server.h"
 
 namespace remoting {
 
diff --git a/remoting/host/host_status_logger_unittest.cc b/remoting/host/host_status_logger_unittest.cc
index 2b0c7e3..ef2fd35 100644
--- a/remoting/host/host_status_logger_unittest.cc
+++ b/remoting/host/host_status_logger_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "remoting/host/host_status_monitor_fake.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/host_status_sender.cc b/remoting/host/host_status_sender.cc
index 44fe98ec..032cf3f 100644
--- a/remoting/host/host_status_sender.cc
+++ b/remoting/host/host_status_sender.cc
@@ -10,9 +10,9 @@
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/host/server_log_entry_host.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/server_log_entry.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/server_log_entry.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
diff --git a/remoting/host/host_status_sender.h b/remoting/host/host_status_sender.h
index 3fa86b5..14afb75 100644
--- a/remoting/host/host_status_sender.h
+++ b/remoting/host/host_status_sender.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/host/host_exit_codes.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/remoting/host/host_status_sender_unittest.cc b/remoting/host/host_status_sender_unittest.cc
index 8d87aaf..b093ea3 100644
--- a/remoting/host/host_status_sender_unittest.cc
+++ b/remoting/host/host_status_sender_unittest.cc
@@ -11,7 +11,7 @@
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/base/test_rsa_key_pair.h"
 #include "remoting/host/host_exit_codes.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index d715819..b9a17f8 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -21,9 +21,9 @@
 #include "remoting/host/policy_hack/policy_watcher.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/host/session_manager_factory.h"
-#include "remoting/jingle_glue/network_settings.h"
-#include "remoting/jingle_glue/server_log_entry.h"
 #include "remoting/protocol/it2me_host_authenticator_factory.h"
+#include "remoting/protocol/network_settings.h"
+#include "remoting/signaling/server_log_entry.h"
 
 namespace remoting {
 
@@ -184,13 +184,13 @@ void It2MeHost::FinishConnect() {
 
   // If NAT traversal is off then limit port range to allow firewall pin-holing.
   HOST_LOG << "NAT state: " << nat_traversal_enabled_;
-  NetworkSettings network_settings(
+  protocol::NetworkSettings network_settings(
      nat_traversal_enabled_ ?
-     NetworkSettings::NAT_TRAVERSAL_FULL :
-     NetworkSettings::NAT_TRAVERSAL_DISABLED);
+     protocol::NetworkSettings::NAT_TRAVERSAL_FULL :
+     protocol::NetworkSettings::NAT_TRAVERSAL_DISABLED);
   if (!nat_traversal_enabled_) {
-    network_settings.min_port = NetworkSettings::kDefaultMinPort;
-    network_settings.max_port = NetworkSettings::kDefaultMaxPort;
+    network_settings.min_port = protocol::NetworkSettings::kDefaultMinPort;
+    network_settings.max_port = protocol::NetworkSettings::kDefaultMaxPort;
   }
 
   // Create the host.
diff --git a/remoting/host/it2me/it2me_host.h b/remoting/host/it2me/it2me_host.h
index 2c51eba..c970aad 100644
--- a/remoting/host/it2me/it2me_host.h
+++ b/remoting/host/it2me/it2me_host.h
@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "remoting/host/host_status_observer.h"
-#include "remoting/jingle_glue/xmpp_signal_strategy.h"
+#include "remoting/signaling/xmpp_signal_strategy.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/remoting/host/register_support_host_request.cc b/remoting/host/register_support_host_request.cc
index 179b9a8..375487b 100644
--- a/remoting/host/register_support_host_request.cc
+++ b/remoting/host/register_support_host_request.cc
@@ -11,8 +11,8 @@
 #include "base/time/time.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/host_config.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
diff --git a/remoting/host/register_support_host_request.h b/remoting/host/register_support_host_request.h
index 7fce5ea..925b3f3 100644
--- a/remoting/host/register_support_host_request.h
+++ b/remoting/host/register_support_host_request.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/base/rsa_key_pair.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace buzz {
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index 2de2d7b..a1ab4c1 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -14,8 +14,8 @@
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/base/test_rsa_key_pair.h"
 #include "remoting/host/in_memory_host_config.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 55f13fe..78daa67 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -68,11 +68,11 @@
 #include "remoting/host/token_validator_factory_impl.h"
 #include "remoting/host/usage_stats_consent.h"
 #include "remoting/host/username.h"
-#include "remoting/jingle_glue/network_settings.h"
-#include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
+#include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/token_validator.h"
+#include "remoting/signaling/xmpp_signal_strategy.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
@@ -99,7 +99,9 @@
 #include "remoting/host/pairing_registry_delegate_win.h"
 #include "remoting/host/win/session_desktop_environment.h"
 #endif  // defined(OS_WIN)
+
 using remoting::protocol::PairingRegistry;
+using remoting::protocol::NetworkSettings;
 
 namespace {
 
diff --git a/remoting/host/server_log_entry_host.cc b/remoting/host/server_log_entry_host.cc
index 069dc2d..dc240f5 100644
--- a/remoting/host/server_log_entry_host.cc
+++ b/remoting/host/server_log_entry_host.cc
@@ -6,7 +6,7 @@
 
 #include "base/strings/stringize_macros.h"
 #include "base/sys_info.h"
-#include "remoting/jingle_glue/server_log_entry.h"
+#include "remoting/signaling/server_log_entry.h"
 
 using base::SysInfo;
 
diff --git a/remoting/host/server_log_entry_host_unittest.cc b/remoting/host/server_log_entry_host_unittest.cc
index 603e2ee..d306bea 100644
--- a/remoting/host/server_log_entry_host_unittest.cc
+++ b/remoting/host/server_log_entry_host_unittest.cc
@@ -5,8 +5,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringize_macros.h"
 #include "remoting/host/server_log_entry_host.h"
-#include "remoting/jingle_glue/server_log_entry.h"
-#include "remoting/jingle_glue/server_log_entry_unittest.h"
+#include "remoting/signaling/server_log_entry.h"
+#include "remoting/signaling/server_log_entry_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
diff --git a/remoting/host/session_manager_factory.cc b/remoting/host/session_manager_factory.cc
index a055df2..080b7ce 100644
--- a/remoting/host/session_manager_factory.cc
+++ b/remoting/host/session_manager_factory.cc
@@ -4,24 +4,24 @@
 
 #include "remoting/host/session_manager_factory.h"
 
-#include "remoting/jingle_glue/chromium_port_allocator.h"
-#include "remoting/jingle_glue/chromium_socket_factory.h"
-#include "remoting/jingle_glue/network_settings.h"
+#include "remoting/protocol/chromium_port_allocator.h"
+#include "remoting/protocol/chromium_socket_factory.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
+#include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/session_manager.h"
 
 namespace remoting {
 
 scoped_ptr<protocol::SessionManager> CreateHostSessionManager(
     SignalStrategy* signal_strategy,
-    const NetworkSettings& network_settings,
+    const protocol::NetworkSettings& network_settings,
     const scoped_refptr<net::URLRequestContextGetter>&
         url_request_context_getter) {
   // Use Chrome's network stack to allocate ports for peer-to-peer channels.
-  scoped_ptr<ChromiumPortAllocator> port_allocator(
-      ChromiumPortAllocator::Create(url_request_context_getter,
-          network_settings));
+  scoped_ptr<protocol::ChromiumPortAllocator> port_allocator(
+      protocol::ChromiumPortAllocator::Create(url_request_context_getter,
+                                              network_settings));
 
   scoped_ptr<protocol::TransportFactory> transport_factory(
       new protocol::LibjingleTransportFactory(
diff --git a/remoting/host/session_manager_factory.h b/remoting/host/session_manager_factory.h
index ce2a53d..4bce1f6 100644
--- a/remoting/host/session_manager_factory.h
+++ b/remoting/host/session_manager_factory.h
@@ -14,16 +14,16 @@ class URLRequestContextGetter;
 
 namespace remoting {
 
-struct NetworkSettings;
 class SignalStrategy;
 
 namespace protocol {
+struct NetworkSettings;
 class SessionManager;
 }  // namespace protocol
 
 scoped_ptr<protocol::SessionManager> CreateHostSessionManager(
     SignalStrategy* signal_strategy,
-    const NetworkSettings& network_settings,
+    const protocol::NetworkSettings& network_settings,
     const scoped_refptr<net::URLRequestContextGetter>&
         url_request_context_getter);
 
diff --git a/remoting/host/signaling_connector.h b/remoting/host/signaling_connector.h
index 6e683b7..a0912f1 100644
--- a/remoting/host/signaling_connector.h
+++ b/remoting/host/signaling_connector.h
@@ -11,7 +11,7 @@
 #include "base/timer/timer.h"
 #include "net/base/network_change_notifier.h"
 #include "remoting/host/oauth_token_getter.h"
-#include "remoting/jingle_glue/xmpp_signal_strategy.h"
+#include "remoting/signaling/xmpp_signal_strategy.h"
 
 namespace remoting {
 
diff --git a/remoting/ios/bridge/DEPS b/remoting/ios/bridge/DEPS
index 565acfc..8ef25d4 100644
--- a/remoting/ios/bridge/DEPS
+++ b/remoting/ios/bridge/DEPS
@@ -3,6 +3,6 @@ include_rules = [
 
   "-remoting/host",
   "+remoting/client",
-  "+remoting/jingle_glue",
   "+remoting/protocol",
-] 
+  "+remoting/signaling",
+]
diff --git a/remoting/ios/bridge/client_instance.cc b/remoting/ios/bridge/client_instance.cc
index 5a49922..faeb745 100644
--- a/remoting/ios/bridge/client_instance.cc
+++ b/remoting/ios/bridge/client_instance.cc
@@ -12,7 +12,7 @@
 #include "remoting/client/audio_player.h"
 #include "remoting/client/plugin/delegating_signal_strategy.h"
 #include "remoting/ios/bridge/client_proxy.h"
-#include "remoting/jingle_glue/chromium_port_allocator.h"
+#include "remoting/protocol/chromium_port_allocator.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 #include "remoting/protocol/negotiating_client_authenticator.h"
@@ -346,10 +346,12 @@ void ClientInstance::ConnectToHostOnNetworkThread(
                              url_requester_,
                              xmpp_config_));
 
-  NetworkSettings network_settings(NetworkSettings::NAT_TRAVERSAL_ENABLED);
+  protocol::NetworkSettings network_settings(
+      protocol::NetworkSettings::NAT_TRAVERSAL_ENABLED);
 
-  scoped_ptr<ChromiumPortAllocator> port_allocator(
-      ChromiumPortAllocator::Create(url_requester_, network_settings));
+  scoped_ptr<protocol::ChromiumPortAllocator> port_allocator(
+      protocol::ChromiumPortAllocator::Create(url_requester_,
+                                              network_settings));
 
   scoped_ptr<protocol::TransportFactory> transport_factory(
       new protocol::LibjingleTransportFactory(
diff --git a/remoting/ios/bridge/client_instance.h b/remoting/ios/bridge/client_instance.h
index 4c631e3..1cd738e 100644
--- a/remoting/ios/bridge/client_instance.h
+++ b/remoting/ios/bridge/client_instance.h
@@ -18,13 +18,11 @@
 #include "remoting/client/client_user_interface.h"
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/software_video_renderer.h"
-
 #include "remoting/ios/bridge/frame_consumer_bridge.h"
-
-#include "remoting/jingle_glue/network_settings.h"
-#include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/cursor_shape_stub.h"
+#include "remoting/protocol/network_settings.h"
+#include "remoting/signaling/xmpp_signal_strategy.h"
 
 namespace remoting {
 
diff --git a/remoting/protocol/DEPS b/remoting/protocol/DEPS
index 8b14bb2..7848a62 100644
--- a/remoting/protocol/DEPS
+++ b/remoting/protocol/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+ppapi/cpp",
   "+ppapi/utility",
   "+remoting/codec",
-  "+remoting/jingle_glue",
+  "+remoting/signaling",
   "+third_party/libjingle",
   "+third_party/protobuf/src",
 ]
diff --git a/remoting/jingle_glue/chromium_port_allocator.cc b/remoting/protocol/chromium_port_allocator.cc
index 278cb6c..cfa261f 100644
--- a/remoting/jingle_glue/chromium_port_allocator.cc
+++ b/remoting/protocol/chromium_port_allocator.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/chromium_port_allocator.h"
+#include "remoting/protocol/chromium_port_allocator.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ -11,11 +11,12 @@
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "remoting/jingle_glue/chromium_socket_factory.h"
-#include "remoting/jingle_glue/network_settings.h"
+#include "remoting/protocol/chromium_socket_factory.h"
+#include "remoting/protocol/network_settings.h"
 #include "url/gurl.h"
 
 namespace remoting {
+namespace protocol {
 
 namespace {
 
@@ -135,7 +136,7 @@ scoped_ptr<ChromiumPortAllocator> ChromiumPortAllocator::Create(
   scoped_ptr<talk_base::NetworkManager> network_manager(
       new talk_base::BasicNetworkManager());
   scoped_ptr<talk_base::PacketSocketFactory> socket_factory(
-      new remoting::ChromiumPacketSocketFactory());
+      new ChromiumPacketSocketFactory());
   scoped_ptr<ChromiumPortAllocator> result(
       new ChromiumPortAllocator(url_context, network_manager.Pass(),
                             socket_factory.Pass()));
@@ -185,4 +186,5 @@ cricket::PortAllocatorSession* ChromiumPortAllocator::CreateSessionInternal(
       stun_hosts(), relay_hosts(), relay_token(), url_context_);
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/jingle_glue/chromium_port_allocator.h b/remoting/protocol/chromium_port_allocator.h
index d5c850f..00aedc1 100644
--- a/remoting/jingle_glue/chromium_port_allocator.h
+++ b/remoting/protocol/chromium_port_allocator.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_CHROMIUM_PORT_ALLOCATOR_H_
-#define REMOTING_JINGLE_GLUE_CHROMIUM_PORT_ALLOCATOR_H_
+#ifndef REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_H_
+#define REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_H_
 
 #include <set>
 
@@ -16,6 +16,7 @@ class URLRequestContextGetter;
 }  // namespace net
 
 namespace remoting {
+namespace protocol {
 
 struct NetworkSettings;
 
@@ -50,6 +51,7 @@ class ChromiumPortAllocator : public cricket::HttpPortAllocatorBase {
   DISALLOW_COPY_AND_ASSIGN(ChromiumPortAllocator);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HOST_PORT_ALLOCATOR_H_
diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc
index 09e45f4..055f87f 100644
--- a/remoting/jingle_glue/chromium_socket_factory.cc
+++ b/remoting/protocol/chromium_socket_factory.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/chromium_socket_factory.h"
+#include "remoting/protocol/chromium_socket_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -12,11 +12,12 @@
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
-#include "remoting/jingle_glue/socket_util.h"
+#include "remoting/protocol/socket_util.h"
 #include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 #include "third_party/libjingle/source/talk/base/nethelpers.h"
 
 namespace remoting {
+namespace protocol {
 
 namespace {
 
@@ -392,4 +393,5 @@ ChromiumPacketSocketFactory::CreateAsyncResolver() {
   return new talk_base::AsyncResolver();
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/jingle_glue/chromium_socket_factory.h b/remoting/protocol/chromium_socket_factory.h
index 0c66982..5a886a5 100644
--- a/remoting/jingle_glue/chromium_socket_factory.h
+++ b/remoting/protocol/chromium_socket_factory.h
@@ -1,14 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
-#define REMOTING_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
+#ifndef REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_
+#define REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_
 
 #include "base/compiler_specific.h"
 #include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
 
 namespace remoting {
+namespace protocol {
 
 class ChromiumPacketSocketFactory : public talk_base::PacketSocketFactory {
  public:
@@ -34,6 +35,7 @@ class ChromiumPacketSocketFactory : public talk_base::PacketSocketFactory {
   DISALLOW_COPY_AND_ASSIGN(ChromiumPacketSocketFactory);
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
+#endif  // REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_
diff --git a/remoting/jingle_glue/chromium_socket_factory_unittest.cc b/remoting/protocol/chromium_socket_factory_unittest.cc
index 6ec9a88..8755d66 100644
--- a/remoting/jingle_glue/chromium_socket_factory_unittest.cc
+++ b/remoting/protocol/chromium_socket_factory_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/chromium_socket_factory.h"
+#include "remoting/protocol/chromium_socket_factory.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ -12,6 +12,7 @@
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 
 namespace remoting {
+namespace protocol {
 
 class ChromiumSocketFactoryTest : public testing::Test,
                                   public sigslot::has_slots<> {
@@ -110,4 +111,5 @@ TEST_F(ChromiumSocketFactoryTest, TransientError) {
   VerifyCanSendAndReceive(sending_socket.get());
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 1e6940a..86ab544 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -8,7 +8,6 @@
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/audio_reader.h"
 #include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/auth_util.h"
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 88d633c..e766741 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -13,7 +13,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
-#include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/clipboard_filter.h"
 #include "remoting/protocol/errors.h"
@@ -22,6 +21,7 @@
 #include "remoting/protocol/monitored_video_stub.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_manager.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace remoting {
 
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index cf3e9e3..57a78fd 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -12,7 +12,6 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/channel_multiplexer.h"
@@ -20,6 +19,7 @@
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/signaling/iq_sender.h"
 #include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index e3038e5..3e148cf 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -14,13 +14,13 @@
 #include "base/timer/timer.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/completion_callback.h"
-#include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport.h"
+#include "remoting/signaling/iq_sender.h"
 
 namespace net {
 class Socket;
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 58bcd4d..0c2f26e 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -5,13 +5,13 @@
 #include "remoting/protocol/jingle_session_manager.h"
 
 #include "base/bind.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/content_description.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/jingle_session.h"
 #include "remoting/protocol/transport.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index e808ad2..0193523 100644
--- a/remoting/protocol/jingle_session_manager.h
+++ b/remoting/protocol/jingle_session_manager.h
@@ -11,9 +11,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "net/cert/x509_certificate.h"
-#include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/session_manager.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace pp {
 class Instance;
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 037cbcb..fee6aa2 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -14,15 +14,15 @@
 #include "net/socket/stream_socket.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/chromium_port_allocator.h"
-#include "remoting/jingle_glue/fake_signal_strategy.h"
-#include "remoting/jingle_glue/network_settings.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/chromium_port_allocator.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
+#include "remoting/protocol/network_settings.h"
+#include "remoting/signaling/fake_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 34acb39..d2bddc3 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -13,9 +13,9 @@
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/jingle_info_request.h"
-#include "remoting/jingle_glue/network_settings.h"
 #include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/network_settings.h"
+#include "remoting/signaling/jingle_info_request.h"
 #include "third_party/libjingle/source/talk/base/network.h"
 #include "third_party/libjingle/source/talk/p2p/base/constants.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
diff --git a/remoting/protocol/libjingle_transport_factory.h b/remoting/protocol/libjingle_transport_factory.h
index 637410c..1c00731 100644
--- a/remoting/protocol/libjingle_transport_factory.h
+++ b/remoting/protocol/libjingle_transport_factory.h
@@ -8,7 +8,7 @@
 #include <list>
 
 #include "base/callback_forward.h"
-#include "remoting/jingle_glue/network_settings.h"
+#include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/transport.h"
 
 namespace cricket {
diff --git a/remoting/jingle_glue/network_settings.cc b/remoting/protocol/network_settings.cc
index d3e464c..67db267 100644
--- a/remoting/jingle_glue/network_settings.cc
+++ b/remoting/protocol/network_settings.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/network_settings.h"
+#include "remoting/protocol/network_settings.h"
 
 #include <limits.h>
 #include <stdlib.h>
@@ -11,6 +11,7 @@
 #include "base/strings/string_util.h"
 
 namespace remoting {
+namespace protocol {
 
 // static
   bool NetworkSettings::ParsePortRange(const std::string& port_range,
@@ -42,4 +43,5 @@ namespace remoting {
   return true;
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/jingle_glue/network_settings.h b/remoting/protocol/network_settings.h
index 1ff83eb..7a9687e 100644
--- a/remoting/jingle_glue/network_settings.h
+++ b/remoting/protocol/network_settings.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_NETWORK_SETTINGS_H_
-#define REMOTING_JINGLE_GLUE_NETWORK_SETTINGS_H_
+#ifndef REMOTING_PROTOCOL_NETWORK_SETTINGS_H_
+#define REMOTING_PROTOCOL_NETWORK_SETTINGS_H_
 
 #include <string>
 
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 
 namespace remoting {
+namespace protocol {
 
 struct NetworkSettings {
 
@@ -69,6 +70,7 @@ struct NetworkSettings {
   int max_port;
 };
 
+}  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_NETWORK_SETTINGS_H_
diff --git a/remoting/jingle_glue/network_settings_unittest.cc b/remoting/protocol/network_settings_unittest.cc
index 4a00636..c62c51b 100644
--- a/remoting/jingle_glue/network_settings_unittest.cc
+++ b/remoting/protocol/network_settings_unittest.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/network_settings.h"
+#include "remoting/protocol/network_settings.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
+namespace protocol {
 
 TEST(ParsePortRange, Basic) {
   int min, max;
@@ -38,4 +40,5 @@ TEST(ParsePortRange, Basic) {
   EXPECT_FALSE(NetworkSettings::ParsePortRange("1foo-2bar", &min, &max));
 }
 
+}  // namespace protocol
 }  // namespace remoting
diff --git a/remoting/jingle_glue/socket_util.cc b/remoting/protocol/socket_util.cc
index 50e945d..1967a40 100644
--- a/remoting/jingle_glue/socket_util.cc
+++ b/remoting/protocol/socket_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/socket_util.h"
+#include "remoting/protocol/socket_util.h"
 
 #include "net/base/net_errors.h"
 
diff --git a/remoting/jingle_glue/socket_util.h b/remoting/protocol/socket_util.h
index ce087ae..1f9fff5 100644
--- a/remoting/jingle_glue/socket_util.h
+++ b/remoting/protocol/socket_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_JINGLE_GLUE_SOCKET_UTIL_H_
-#define REMOTING_JINGLE_GLUE_SOCKET_UTIL_H_
+#ifndef REMOTING_PROTOCOL_SOCKET_UTIL_H_
+#define REMOTING_PROTOCOL_SOCKET_UTIL_H_
 
 namespace remoting {
 
@@ -20,4 +20,4 @@ SocketErrorAction GetSocketErrorAction(int error);
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_SOCKET_UTIL_H_
+#endif  // REMOTING_PROTOCOL_SOCKET_UTIL_H_
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index 0337491..c2598c9 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -122,7 +122,7 @@
       ],
       'sources!': [
         'base/url_request_context_getter.cc',
-        'jingle_glue/chromium_socket_factory.cc',
+        'protocol/chromium_socket_factory.cc',
       ],
 
       # Include normalizing_input_filter_mac.cc excluded by the filename
diff --git a/remoting/remoting_srcs.gypi b/remoting/remoting_srcs.gypi
index 0471736..5790eca 100644
--- a/remoting/remoting_srcs.gypi
+++ b/remoting/remoting_srcs.gypi
@@ -67,25 +67,6 @@
     ],
 
     'remoting_protocol_sources': [
-      'jingle_glue/chromium_port_allocator.cc',
-      'jingle_glue/chromium_port_allocator.h',
-      'jingle_glue/chromium_socket_factory.cc',
-      'jingle_glue/chromium_socket_factory.h',
-      'jingle_glue/iq_sender.cc',
-      'jingle_glue/iq_sender.h',
-      'jingle_glue/jingle_info_request.cc',
-      'jingle_glue/jingle_info_request.h',
-      'jingle_glue/log_to_server.cc',
-      'jingle_glue/log_to_server.h',
-      'jingle_glue/network_settings.cc',
-      'jingle_glue/network_settings.h',
-      'jingle_glue/server_log_entry.cc',
-      'jingle_glue/server_log_entry.h',
-      'jingle_glue/signal_strategy.h',
-      'jingle_glue/socket_util.cc',
-      'jingle_glue/socket_util.h',
-      'jingle_glue/xmpp_signal_strategy.cc',
-      'jingle_glue/xmpp_signal_strategy.h',
       'protocol/audio_reader.cc',
       'protocol/audio_reader.h',
       'protocol/audio_stub.h',
@@ -104,6 +85,10 @@
       'protocol/channel_dispatcher_base.h',
       'protocol/channel_multiplexer.cc',
       'protocol/channel_multiplexer.h',
+      'protocol/chromium_port_allocator.cc',
+      'protocol/chromium_port_allocator.h',
+      'protocol/chromium_socket_factory.cc',
+      'protocol/chromium_socket_factory.h',
       'protocol/client_control_dispatcher.cc',
       'protocol/client_control_dispatcher.h',
       'protocol/client_event_dispatcher.cc',
@@ -162,6 +147,8 @@
       'protocol/negotiating_client_authenticator.h',
       'protocol/negotiating_host_authenticator.cc',
       'protocol/negotiating_host_authenticator.h',
+      'protocol/network_settings.cc',
+      'protocol/network_settings.h',
       'protocol/pairing_authenticator_base.cc',
       'protocol/pairing_authenticator_base.h',
       'protocol/pairing_client_authenticator.cc',
@@ -178,6 +165,8 @@
       'protocol/session_config.cc',
       'protocol/session_config.h',
       'protocol/session_manager.h',
+      'protocol/socket_util.cc',
+      'protocol/socket_util.h',
       'protocol/ssl_hmac_channel_authenticator.cc',
       'protocol/ssl_hmac_channel_authenticator.h',
       'protocol/third_party_authenticator_base.cc',
@@ -196,6 +185,17 @@
       'protocol/video_stub.h',
       'protocol/video_writer.cc',
       'protocol/video_writer.h',
+      'signaling/iq_sender.cc',
+      'signaling/iq_sender.h',
+      'signaling/jingle_info_request.cc',
+      'signaling/jingle_info_request.h',
+      'signaling/log_to_server.cc',
+      'signaling/log_to_server.h',
+      'signaling/server_log_entry.cc',
+      'signaling/server_log_entry.h',
+      'signaling/signal_strategy.h',
+      'signaling/xmpp_signal_strategy.cc',
+      'signaling/xmpp_signal_strategy.h',
     ],
 
     'remoting_client_sources': [
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
index 903d88a..d4512b7 100644
--- a/remoting/remoting_test.gypi
+++ b/remoting/remoting_test.gypi
@@ -121,20 +121,11 @@
         'host/win/worker_process_launcher.cc',
         'host/win/worker_process_launcher.h',
         'host/win/worker_process_launcher_unittest.cc',
-        'jingle_glue/chromium_socket_factory_unittest.cc',
-        'jingle_glue/fake_signal_strategy.cc',
-        'jingle_glue/fake_signal_strategy.h',
-        'jingle_glue/iq_sender_unittest.cc',
-	'jingle_glue/log_to_server_unittest.cc',
-        'jingle_glue/mock_objects.cc',
-        'jingle_glue/mock_objects.h',
-        'jingle_glue/network_settings_unittest.cc',
-        'jingle_glue/server_log_entry_unittest.cc',
-        'jingle_glue/server_log_entry_unittest.h',
         'protocol/authenticator_test_base.cc',
         'protocol/authenticator_test_base.h',
         'protocol/buffered_socket_writer_unittest.cc',
         'protocol/channel_multiplexer_unittest.cc',
+        'protocol/chromium_socket_factory_unittest.cc',
         'protocol/clipboard_echo_filter_unittest.cc',
         'protocol/clipboard_filter_unittest.cc',
         'protocol/connection_tester.cc',
@@ -154,6 +145,7 @@
         'protocol/monitored_video_stub_unittest.cc',
         'protocol/mouse_input_filter_unittest.cc',
         'protocol/negotiating_authenticator_unittest.cc',
+        'protocol/network_settings_unittest.cc',
         'protocol/pairing_registry_unittest.cc',
         'protocol/ppapi_module_stub.cc',
         'protocol/protocol_mock_objects.cc',
@@ -161,6 +153,14 @@
         'protocol/ssl_hmac_channel_authenticator_unittest.cc',
         'protocol/third_party_authenticator_unittest.cc',
         'protocol/v2_authenticator_unittest.cc',
+        'signaling/fake_signal_strategy.cc',
+        'signaling/fake_signal_strategy.h',
+        'signaling/iq_sender_unittest.cc',
+        'signaling/log_to_server_unittest.cc',
+        'signaling/mock_signal_strategy.cc',
+        'signaling/mock_signal_strategy.h',
+        'signaling/server_log_entry_unittest.cc',
+        'signaling/server_log_entry_unittest.h',
       ],
       'conditions': [
         [ 'OS=="win"', {
diff --git a/remoting/jingle_glue/DEPS b/remoting/signaling/DEPS
index f7228c3d8..f7228c3d8 100644
--- a/remoting/jingle_glue/DEPS
+++ b/remoting/signaling/DEPS
diff --git a/remoting/jingle_glue/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc
index 50bb19b..8ce08c0 100644
--- a/remoting/jingle_glue/fake_signal_strategy.cc
+++ b/remoting/signaling/fake_signal_strategy.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/fake_signal_strategy.h"
+#include "remoting/signaling/fake_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/remoting/jingle_glue/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h
index 9dc25cf..2decda6 100644
--- a/remoting/jingle_glue/fake_signal_strategy.h
+++ b/remoting/signaling/fake_signal_strategy.h
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_FAKE_SIGNAL_STRATEGY_H_
-#define REMOTING_JINGLE_GLUE_FAKE_SIGNAL_STRATEGY_H_
+#ifndef REMOTING_SIGNALING_FAKE_SIGNAL_STRATEGY_H_
+#define REMOTING_SIGNALING_FAKE_SIGNAL_STRATEGY_H_
 
 #include <list>
 #include <queue>
 #include <string>
 
-#include "base/observer_list.h"
 #include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace remoting {
 
@@ -65,4 +65,4 @@ class FakeSignalStrategy : public SignalStrategy,
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_FAKE_SIGNAL_STRATEGY_H_
+#endif  // REMOTING_SIGNALING_FAKE_SIGNAL_STRATEGY_H_
diff --git a/remoting/jingle_glue/iq_sender.cc b/remoting/signaling/iq_sender.cc
index 7b00c7f..bbd7608 100644
--- a/remoting/jingle_glue/iq_sender.cc
+++ b/remoting/signaling/iq_sender.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/iq_sender.h"
+#include "remoting/signaling/iq_sender.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ -12,7 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
diff --git a/remoting/jingle_glue/iq_sender.h b/remoting/signaling/iq_sender.h
index ce333e5..7c41daa 100644
--- a/remoting/jingle_glue/iq_sender.h
+++ b/remoting/signaling/iq_sender.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_IQ_SENDER_H_
-#define REMOTING_JINGLE_GLUE_IQ_SENDER_H_
+#ifndef REMOTING_SIGNALING_IQ_SENDER_H_
+#define REMOTING_SIGNALING_IQ_SENDER_H_
 
 #include <map>
 #include <string>
@@ -13,7 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace base {
 class TimeDelta;
@@ -110,4 +110,4 @@ class IqRequest : public  base::SupportsWeakPtr<IqRequest> {
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_IQ_SENDER_H_
+#endif  // REMOTING_SIGNALING_IQ_SENDER_H_
diff --git a/remoting/jingle_glue/iq_sender_unittest.cc b/remoting/signaling/iq_sender_unittest.cc
index dd776f9..88aa12b 100644
--- a/remoting/jingle_glue/iq_sender_unittest.cc
+++ b/remoting/signaling/iq_sender_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
@@ -7,8 +7,8 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
diff --git a/remoting/jingle_glue/jingle_info_request.cc b/remoting/signaling/jingle_info_request.cc
index d41f18a..0fc4ab4 100644
--- a/remoting/jingle_glue/jingle_info_request.cc
+++ b/remoting/signaling/jingle_info_request.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/jingle_info_request.h"
+#include "remoting/signaling/jingle_info_request.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ -10,7 +10,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "net/base/net_util.h"
-#include "remoting/jingle_glue/iq_sender.h"
+#include "remoting/signaling/iq_sender.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
diff --git a/remoting/jingle_glue/jingle_info_request.h b/remoting/signaling/jingle_info_request.h
index 118aa4a..b1cbf6f 100644
--- a/remoting/jingle_glue/jingle_info_request.h
+++ b/remoting/signaling/jingle_info_request.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_JINGLE_INFO_REQUEST_H_
-#define REMOTING_JINGLE_GLUE_JINGLE_INFO_REQUEST_H_
+#ifndef REMOTING_SIGNALING_JINGLE_INFO_REQUEST_H_
+#define REMOTING_SIGNALING_JINGLE_INFO_REQUEST_H_
 
 #include <set>
 #include <string>
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
-#include "remoting/jingle_glue/iq_sender.h"
+#include "remoting/signaling/iq_sender.h"
 
 namespace buzz {
 class XmlElement;
@@ -61,4 +61,4 @@ class JingleInfoRequest {
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_JINGLE_INFO_REQUEST_H_
+#endif  // REMOTING_SIGNALING_JINGLE_INFO_REQUEST_H_
diff --git a/remoting/jingle_glue/log_to_server.cc b/remoting/signaling/log_to_server.cc
index ed9d308..20a8efc 100644
--- a/remoting/jingle_glue/log_to_server.cc
+++ b/remoting/signaling/log_to_server.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/log_to_server.h"
+#include "remoting/signaling/log_to_server.h"
 
 #include "remoting/base/constants.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
diff --git a/remoting/jingle_glue/log_to_server.h b/remoting/signaling/log_to_server.h
index 0414d6e..cfae054 100644
--- a/remoting/jingle_glue/log_to_server.h
+++ b/remoting/signaling/log_to_server.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_JINGLE_GLUE_LOG_TO_SERVER_H_
-#define REMOTING_JINGLE_GLUE_LOG_TO_SERVER_H_
+#ifndef REMOTING_SIGNALING_LOG_TO_SERVER_H_
+#define REMOTING_SIGNALING_LOG_TO_SERVER_H_
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/threading/non_thread_safe.h"
-#include "remoting/jingle_glue/server_log_entry.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/server_log_entry.h"
+#include "remoting/signaling/signal_strategy.h"
 
 namespace buzz {
 class XmlElement;
@@ -57,4 +57,4 @@ class LogToServer : public base::NonThreadSafe,
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_LOG_TO_SERVER_H_
+#endif  // REMOTING_SIGNALING_LOG_TO_SERVER_H_
diff --git a/remoting/jingle_glue/log_to_server_unittest.cc b/remoting/signaling/log_to_server_unittest.cc
index aaab144..01e839b 100644
--- a/remoting/jingle_glue/log_to_server_unittest.cc
+++ b/remoting/signaling/log_to_server_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/log_to_server.h"
+#include "remoting/signaling/log_to_server.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "remoting/jingle_glue/mock_objects.h"
-#include "remoting/jingle_glue/server_log_entry_unittest.h"
+#include "remoting/signaling/mock_signal_strategy.h"
+#include "remoting/signaling/server_log_entry_unittest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/remoting/jingle_glue/mock_objects.cc b/remoting/signaling/mock_signal_strategy.cc
index d9178fa..7133587 100644
--- a/remoting/jingle_glue/mock_objects.cc
+++ b/remoting/signaling/mock_signal_strategy.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/signaling/mock_signal_strategy.h"
 
 namespace remoting {
 
diff --git a/remoting/jingle_glue/mock_objects.h b/remoting/signaling/mock_signal_strategy.h
index 1804628..4379523 100644
--- a/remoting/jingle_glue/mock_objects.h
+++ b/remoting/signaling/mock_signal_strategy.h
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
 #include "base/memory/scoped_ptr.h"
-#include "remoting/jingle_glue/iq_sender.h"
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/iq_sender.h"
+#include "remoting/signaling/signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
diff --git a/remoting/jingle_glue/server_log_entry.cc b/remoting/signaling/server_log_entry.cc
index e90721b..a87e116 100644
--- a/remoting/jingle_glue/server_log_entry.cc
+++ b/remoting/signaling/server_log_entry.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/server_log_entry.h"
+#include "remoting/signaling/server_log_entry.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
diff --git a/remoting/jingle_glue/server_log_entry.h b/remoting/signaling/server_log_entry.h
index ab2314d..f1b0ece 100644
--- a/remoting/jingle_glue/server_log_entry.h
+++ b/remoting/signaling/server_log_entry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_JINGLE_GLUE_SERVER_LOG_ENTRY_H_
-#define REMOTING_JINGLE_GLUE_SERVER_LOG_ENTRY_H_
+#ifndef REMOTING_SIGNALING_SERVER_LOG_ENTRY_H_
+#define REMOTING_SIGNALING_SERVER_LOG_ENTRY_H_
 
 #include <map>
 #include <string>
@@ -61,4 +61,4 @@ class ServerLogEntry {
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_SERVER_LOG_ENTRY_H_
+#endif  // REMOTING_SIGNALING_SERVER_LOG_ENTRY_H_
diff --git a/remoting/jingle_glue/server_log_entry_unittest.cc b/remoting/signaling/server_log_entry_unittest.cc
index 824224d..d107823 100644
--- a/remoting/jingle_glue/server_log_entry_unittest.cc
+++ b/remoting/signaling/server_log_entry_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/jingle_glue/server_log_entry_unittest.h"
+#include "remoting/signaling/server_log_entry_unittest.h"
 
 #include <sstream>
 
diff --git a/remoting/jingle_glue/server_log_entry_unittest.h b/remoting/signaling/server_log_entry_unittest.h
index 5d5c589..5d5c589 100644
--- a/remoting/jingle_glue/server_log_entry_unittest.h
+++ b/remoting/signaling/server_log_entry_unittest.h
diff --git a/remoting/jingle_glue/signal_strategy.h b/remoting/signaling/signal_strategy.h
index 206edc0..4d54379 100644
--- a/remoting/jingle_glue/signal_strategy.h
+++ b/remoting/signaling/signal_strategy.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_JINGLE_GLUE_SIGNAL_STRATEGY_H_
-#define REMOTING_JINGLE_GLUE_SIGNAL_STRATEGY_H_
+#ifndef REMOTING_SIGNALING_SIGNAL_STRATEGY_H_
+#define REMOTING_SIGNALING_SIGNAL_STRATEGY_H_
 
 #include <string>
 
@@ -98,4 +98,4 @@ class SignalStrategy {
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_SIGNAL_STRATEGY_H_
+#endif  // REMOTING_SIGNALING_SIGNAL_STRATEGY_H_
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc
index 0f675aa..62b9312 100644
--- a/remoting/jingle_glue/xmpp_signal_strategy.cc
+++ b/remoting/signaling/xmpp_signal_strategy.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "remoting/jingle_glue/xmpp_signal_strategy.h"
+#include "remoting/signaling/xmpp_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.h b/remoting/signaling/xmpp_signal_strategy.h
index 4ef6b70..e612c27 100644
--- a/remoting/jingle_glue/xmpp_signal_strategy.h
+++ b/remoting/signaling/xmpp_signal_strategy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
@@ -7,10 +7,10 @@
 //
 // This class is not threadsafe.
 
-#ifndef REMOTING_JINGLE_GLUE_XMPP_SIGNAL_STRATEGY_H_
-#define REMOTING_JINGLE_GLUE_XMPP_SIGNAL_STRATEGY_H_
+#ifndef REMOTING_SIGNALING_XMPP_SIGNAL_STRATEGY_H_
+#define REMOTING_SIGNALING_XMPP_SIGNAL_STRATEGY_H_
 
-#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/signaling/signal_strategy.h"
 
 #include <vector>
 
@@ -112,4 +112,4 @@ class XmppSignalStrategy : public base::NonThreadSafe,
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_XMPP_SIGNAL_STRATEGY_H_
+#endif  // REMOTING_SIGNALING_XMPP_SIGNAL_STRATEGY_H_