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<> {