diff options
| author | aberent <aberent@chromium.org> | 2016-03-24 07:48:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 14:50:16 +0000 |
| commit | 66cd00e2e4279f83be7e99935e417b2e2002d8f8 (patch) | |
| tree | 560179322817c29ed15f22e5cd0598d0e585492d /remoting/client | |
| parent | 3e33c0a4ad9c2a086373f2d47decc4b5c825c055 (diff) | |
| download | chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.zip chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.tar.gz chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.tar.bz2 | |
Revert of Move ServiceUrls to remoting/host (patchset #4 id:80001 of https://codereview.chromium.org/1817573003/ )
Reason for revert:
Breaks downstream Android ToT builds, and hence prevents Chromium changes rolling into downstream Android builds.
BUG= 597559
Original issue's description:
> Move ServiceUrls to remoting/host
>
> ServiceUrls was used only in one place in android client and it's
> not really useful there. Moved it to the host directory.
>
> TBR=rogerta@chromium.org
>
> Committed: https://crrev.com/2a2656a67bd2ce190df4d918f609bdb4449a64fe
> Cr-Commit-Position: refs/heads/master@{#382939}
TBR=lambroslambrou@chromium.org,rogerta@chromium.org,sergeyu@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1830993002
Cr-Commit-Position: refs/heads/master@{#383060}
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/jni/chromoting_jni_instance.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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( |