16 files changed, 25 insertions, 20 deletions
diff --git a/remoting/DEPS b/remoting/DEPS
index 9d57819..5d57d6c 100644
--- a/remoting/DEPS
+++ b/remoting/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+crypto",
+  "+google_apis",
 
   # Note: Only for net::EnableSSLServerSockets(), which must be called by
   # unit tests at process start.
diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn
index 62112fa..d0bac7c 100644
--- a/remoting/android/BUILD.gn
+++ b/remoting/android/BUILD.gn
@@ -20,6 +20,7 @@ generate_jni("jni_headers") {
 
 shared_library("remoting_client_jni") {
   deps = [
+    "//google_apis",
     "//remoting/android:jni_headers",
     "//remoting/base",
     "//remoting/client",
diff --git a/remoting/base/BUILD.gn b/remoting/base/BUILD.gn
index b8577c1..23dcad1 100644
--- a/remoting/base/BUILD.gn
+++ b/remoting/base/BUILD.gn
@@ -26,6 +26,7 @@ source_set("base") {
   if (is_nacl) {
     sources -= [
       "chromium_url_request.cc",
+      "service_urls.cc",
       "url_request_context_getter.cc",
     ]
   }
diff --git a/remoting/host/service_urls.cc b/remoting/base/service_urls.cc
index d3f2876..3ba940b 100644
--- a/remoting/host/service_urls.cc
+++ b/remoting/base/service_urls.cc
@@ -1,8 +1,8 @@
-// Copyright 2016 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/host/service_urls.h"
+#include "remoting/base/service_urls.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
diff --git a/remoting/host/service_urls.h b/remoting/base/service_urls.h
index 62d279b8..5c47d65 100644
--- a/remoting/host/service_urls.h
+++ b/remoting/base/service_urls.h
@@ -1,9 +1,9 @@
-// Copyright 2016 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_HOST_SERVICE_URLS_H_
-#define REMOTING_HOST_SERVICE_URLS_H_
+#ifndef REMOTING_BASE_SERVICE_URLS_H_
+#define REMOTING_BASE_SERVICE_URLS_H_
 
 #include <string>
 
@@ -66,4 +66,4 @@ class ServiceUrls {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SERVICE_URLS_H_
+#endif  // REMOTING_BASE_SERVICE_URLS_H_
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc
index 1af00bc..dd075a8 100644
--- a/remoting/client/jni/chromoting_jni_instance.cc
+++ b/remoting/client/jni/chromoting_jni_instance.cc
@@ -16,6 +16,7 @@
 #include "jingle/glue/thread_wrapper.h"
 #include "net/socket/client_socket_factory.h"
 #include "remoting/base/chromium_url_request.h"
+#include "remoting/base/service_urls.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/client_status_logger.h"
 #include "remoting/client/jni/android_keymap.h"
@@ -41,8 +42,6 @@ const char* const kXmppServer = "talk.google.com";
 const int kXmppPort = 5222;
 const bool kXmppUseTls = true;
 
-const char kDirectoryBotJid[] = "remoting@bot.talk.google.com";
-
 // Interval at which to log performance statistics, if enabled.
 const int kPerfStatsIntervalMs = 60000;
 
@@ -396,8 +395,9 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
       new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
                              jni_runtime_->url_requester(), xmpp_config_));
 
-  client_status_logger_.reset(new ClientStatusLogger(
-      ServerLogEntry::ME2ME, signaling_.get(), kDirectoryBotJid));
+  client_status_logger_.reset(
+      new ClientStatusLogger(ServerLogEntry::ME2ME, signaling_.get(),
+                             ServiceUrls::GetInstance()->directory_bot_jid()));
 
   scoped_refptr<protocol::TransportContext> transport_context =
       new protocol::TransportContext(
diff --git a/remoting/host/DEPS b/remoting/host/DEPS
index f05283a..052a0c5c 100644
--- a/remoting/host/DEPS
+++ b/remoting/host/DEPS
@@ -3,7 +3,6 @@ include_rules = [
   "+cc/output",
   "+components/policy/core/common",
   "+extensions/browser/api/messaging",
-  "+google_apis",
   "+jingle/glue",
   "+net",
   "+remoting/codec",
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index 0d51b3f..08eb7e1 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -19,6 +19,7 @@
 #include "remoting/base/chromium_url_request.h"
 #include "remoting/base/logging.h"
 #include "remoting/base/rsa_key_pair.h"
+#include "remoting/base/service_urls.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_event_logger.h"
@@ -28,7 +29,6 @@
 #include "remoting/host/it2me_desktop_environment.h"
 #include "remoting/host/policy_watcher.h"
 #include "remoting/host/register_support_host_request.h"
-#include "remoting/host/service_urls.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/chromium_port_allocator_factory.h"
 #include "remoting/protocol/ice_transport.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc
index 87ecea8..424e8b8 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host.cc
@@ -19,9 +19,9 @@
 #include "build/build_config.h"
 #include "net/base/url_util.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "remoting/base/service_urls.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_exit_codes.h"
-#include "remoting/host/service_urls.h"
 #include "remoting/protocol/name_value_map.h"
 
 namespace remoting {
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index eac1eec..a1030dd 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -42,6 +42,7 @@
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/base/rsa_key_pair.h"
+#include "remoting/base/service_urls.h"
 #include "remoting/base/util.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/chromoting_host.h"
@@ -72,7 +73,6 @@
 #include "remoting/host/policy_watcher.h"
 #include "remoting/host/security_key/gnubby_auth_handler.h"
 #include "remoting/host/security_key/gnubby_extension.h"
-#include "remoting/host/service_urls.h"
 #include "remoting/host/shutdown_watchdog.h"
 #include "remoting/host/signaling_connector.h"
 #include "remoting/host/single_window_desktop_environment.h"
diff --git a/remoting/host/setup/start_host.cc b/remoting/host/setup/start_host.cc
index 3c80d81..3009570 100644
--- a/remoting/host/setup/start_host.cc
+++ b/remoting/host/setup/start_host.cc
@@ -16,8 +16,8 @@
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/logging.h"
+#include "remoting/base/service_urls.h"
 #include "remoting/base/url_request_context_getter.h"
-#include "remoting/host/service_urls.h"
 #include "remoting/host/setup/host_starter.h"
 #include "remoting/host/setup/oauth_helper.h"
 #include "remoting/host/setup/pin_validator.h"
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 61d4215..7a79a72 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -38,6 +38,7 @@
             'remoting_client',
             'remoting_jni_headers',
             'remoting_protocol',
+            '../google_apis/google_apis.gyp:google_apis',
             '../ui/events/events.gyp:dom_keycode_converter',
             '../ui/gfx/gfx.gyp:gfx',
           ],
diff --git a/remoting/remoting_host_srcs.gypi b/remoting/remoting_host_srcs.gypi
index d768314..725c5b5 100644
--- a/remoting/remoting_host_srcs.gypi
+++ b/remoting/remoting_host_srcs.gypi
@@ -222,18 +222,16 @@
       'host/security_key/gnubby_extension_session.h',
       'host/security_key/gnubby_socket.cc',
       'host/security_key/gnubby_socket.h',
-      'host/security_key/remote_security_key_ipc_client.cc',
-      'host/security_key/remote_security_key_ipc_client.h',
       'host/security_key/remote_security_key_ipc_constants.cc',
       'host/security_key/remote_security_key_ipc_constants.h',
+      'host/security_key/remote_security_key_ipc_client.cc',
+      'host/security_key/remote_security_key_ipc_client.h',
       'host/security_key/remote_security_key_ipc_server.cc',
       'host/security_key/remote_security_key_ipc_server.h',
       'host/security_key/remote_security_key_ipc_server_impl.cc',
       'host/security_key/remote_security_key_ipc_server_impl.h',
       'host/server_log_entry_host.cc',
       'host/server_log_entry_host.h',
-      'host/service_urls.cc',
-      'host/service_urls.h',
       'host/shaped_desktop_capturer.cc',
       'host/shaped_desktop_capturer.h',
       'host/shutdown_watchdog.cc',
diff --git a/remoting/remoting_srcs.gypi b/remoting/remoting_srcs.gypi
index c6cd2e1..4ab5640 100644
--- a/remoting/remoting_srcs.gypi
+++ b/remoting/remoting_srcs.gypi
@@ -28,6 +28,8 @@
       'base/running_samples.cc',
       'base/running_samples.h',
       'base/scoped_sc_handle_win.h',
+      'base/service_urls.cc',
+      'base/service_urls.h',
       'base/socket_reader.cc',
       'base/socket_reader.h',
       'base/typed_buffer.h',
diff --git a/remoting/test/DEPS b/remoting/test/DEPS
index 7a7eb3a..485d290 100644
--- a/remoting/test/DEPS
+++ b/remoting/test/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+google_apis",
   "+jingle/glue",
   "+net",
   "+remoting/client",
diff --git a/remoting/test/test_chromoting_client.cc b/remoting/test/test_chromoting_client.cc
index 9bc33ca..d4d8c29 100644
--- a/remoting/test/test_chromoting_client.cc
+++ b/remoting/test/test_chromoting_client.cc
@@ -14,6 +14,7 @@
 #include "net/base/request_priority.h"
 #include "net/socket/client_socket_factory.h"
 #include "remoting/base/chromium_url_request.h"
+#include "remoting/base/service_urls.h"
 #include "remoting/base/url_request_context_getter.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/chromoting_client.h"
@@ -125,6 +126,8 @@ void TestChromotingClient::StartConnection(
           make_scoped_ptr(
               new ChromiumUrlRequestFactory(request_context_getter)),
           network_settings, protocol::TransportRole::CLIENT));
+  transport_context->set_ice_config_url(
+      ServiceUrls::GetInstance()->ice_config_url());
 
   protocol::ClientAuthenticationConfig client_auth_config;
   client_auth_config.host_id = connection_setup_info.host_id;