summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 19:11:44 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 19:11:44 +0000
commitd6e6d13cb35c8e1dabd3eca5d03cf5d2c84abf54 (patch)
tree41bdaf07363bf6030ac9025a6d291201fa121684 /remoting/jingle_glue
parent9593bd2d1813e5096b442a276b3a5b7b5408bf6a (diff)
downloadchromium_src-d6e6d13cb35c8e1dabd3eca5d03cf5d2c84abf54.zip
chromium_src-d6e6d13cb35c8e1dabd3eca5d03cf5d2c84abf54.tar.gz
chromium_src-d6e6d13cb35c8e1dabd3eca5d03cf5d2c84abf54.tar.bz2
Cleanups in the chromotocol code.
1) Renamed ChromotingServer to ChromotocolServer. 2) Renamed ChromotingConnection to ChromotocolConnection. 3) Added documentation for ChromotocolServer. 4) Fixed methods names in ChromtocolConnection. 5) Removed some unncessary references to media/*. BUG=None TEST=None Review URL: http://codereview.chromium.org/4105002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r--remoting/jingle_glue/channel_socket_adapter.h4
-rw-r--r--remoting/jingle_glue/iq_request_unittest.cc1
-rw-r--r--remoting/jingle_glue/mock_objects.h1
-rw-r--r--remoting/jingle_glue/stream_socket_adapter.h2
4 files changed, 3 insertions, 5 deletions
diff --git a/remoting/jingle_glue/channel_socket_adapter.h b/remoting/jingle_glue/channel_socket_adapter.h
index 1b808f6..d50c560e 100644
--- a/remoting/jingle_glue/channel_socket_adapter.h
+++ b/remoting/jingle_glue/channel_socket_adapter.h
@@ -16,8 +16,8 @@ class TransportChannel;
namespace remoting {
// TransportChannelSocketAdapter implements net::Socket interface on
-// top of libjingle's TransportChannel. It is used by JingleChromotingConnection
-// to provide net::Socket interface for channels.
+// top of libjingle's TransportChannel. It is used by
+// JingleChromotocolConnection to provide net::Socket interface for channels.
class TransportChannelSocketAdapter : public net::Socket,
public sigslot::has_slots<> {
public:
diff --git a/remoting/jingle_glue/iq_request_unittest.cc b/remoting/jingle_glue/iq_request_unittest.cc
index c79e2fe..4e01fe3 100644
--- a/remoting/jingle_glue/iq_request_unittest.cc
+++ b/remoting/jingle_glue/iq_request_unittest.cc
@@ -4,7 +4,6 @@
#include "base/ref_counted.h"
#include "base/string_util.h"
-#include "media/base/data_buffer.h"
#include "remoting/jingle_glue/iq_request.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/jingle_glue/mock_objects.h b/remoting/jingle_glue/mock_objects.h
index 5963132..08e3cea 100644
--- a/remoting/jingle_glue/mock_objects.h
+++ b/remoting/jingle_glue/mock_objects.h
@@ -5,7 +5,6 @@
#ifndef REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
#define REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
-#include "media/base/data_buffer.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/libjingle/source/talk/base/stream.h"
diff --git a/remoting/jingle_glue/stream_socket_adapter.h b/remoting/jingle_glue/stream_socket_adapter.h
index 53ac76b..2387bdd 100644
--- a/remoting/jingle_glue/stream_socket_adapter.h
+++ b/remoting/jingle_glue/stream_socket_adapter.h
@@ -16,7 +16,7 @@ class StreamInterface;
namespace remoting {
// StreamSocketAdapter implements net::Socket interface on top of
-// libjingle's StreamInterface. It is used by JingleChromotingConnection
+// libjingle's StreamInterface. It is used by JingleChromotocolConnection
// to provide net::Socket interface for channels.
class StreamSocketAdapter : public net::Socket,
public sigslot::has_slots<> {