summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 21:27:50 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 21:27:50 +0000
commitdffd79ee620316b36c93e54d8dc759bbede67912 (patch)
treed9cb564fb71a472238d0b8ce70d852677293ab3f
parent15f4dbad38c1554d25e2b62b091e2de2c69f7035 (diff)
downloadchromium_src-dffd79ee620316b36c93e54d8dc759bbede67912.zip
chromium_src-dffd79ee620316b36c93e54d8dc759bbede67912.tar.gz
chromium_src-dffd79ee620316b36c93e54d8dc759bbede67912.tar.bz2
Purge references to JingleClient.
BUG= TEST= Review URL: http://codereview.chromium.org/7459002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93254 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/client/plugin/chromoting_instance.cc2
-rw-r--r--remoting/host/chromoting_host.cc4
-rw-r--r--remoting/host/chromoting_host.h2
-rw-r--r--remoting/jingle_glue/xmpp_signal_strategy.h2
4 files changed, 4 insertions, 6 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 0bfa05eb3..a83c053 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -98,7 +98,7 @@ bool ChromotingInstance::Init(uint32_t argc,
CreatePepperPortAllocatorSessionFactory(this);
// If we don't have socket dispatcher for IPC (e.g. P2P API is
- // disabled), then JingleClient will try to use physical sockets.
+ // disabled), then JingleSessionManager will try to use physical sockets.
if (socket_dispatcher) {
logger_.VLog(1, "Creating IpcNetworkManager and IpcPacketSocketFactory.");
network_manager = new IpcNetworkManager(socket_dispatcher);
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 0b9c3aa..f951f60 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -95,6 +95,7 @@ void ChromotingHost::Start() {
state_ = kStarted;
}
+ // Use an XMPP connection to the Talk network for session signalling.
std::string xmpp_login;
std::string xmpp_auth_token;
std::string xmpp_auth_service;
@@ -106,7 +107,6 @@ void ChromotingHost::Start() {
return;
}
- // Connect to the talk network with a JingleClient.
signal_strategy_.reset(
new XmppSignalStrategy(context_->jingle_thread(), xmpp_login,
xmpp_auth_token,
@@ -207,7 +207,7 @@ void ChromotingHost::OnSequenceNumberUpdated(ConnectionToClient* connection,
}
////////////////////////////////////////////////////////////////////////////
-// JingleClient::Callback implementations
+// SignalStrategy::StatusObserver implementations
void ChromotingHost::OnStateChange(
SignalStrategy::StatusObserver::State state) {
DCHECK_EQ(MessageLoop::current(), context_->network_message_loop());
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 0bbfe7f..45910ed 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -109,7 +109,7 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
int64 sequence_number);
////////////////////////////////////////////////////////////////////////////
- // SignalStrategy implementation.
+ // SignalStrategy::StatusObserver implementation.
virtual void OnStateChange(
SignalStrategy::StatusObserver::State state) OVERRIDE;
virtual void OnJidChange(const std::string& full_jid) OVERRIDE;
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.h b/remoting/jingle_glue/xmpp_signal_strategy.h
index 9378489..9deb5f0 100644
--- a/remoting/jingle_glue/xmpp_signal_strategy.h
+++ b/remoting/jingle_glue/xmpp_signal_strategy.h
@@ -42,8 +42,6 @@ class XmppSignalStrategy : public SignalStrategy,
virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
private:
- friend class JingleClientTest;
-
void OnConnectionStateChanged(buzz::XmppEngine::State state);
static buzz::PreXmppAuth* CreatePreXmppAuth(
const buzz::XmppClientSettings& settings);