summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-10-28 23:09:15 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 06:09:31 +0000
commitda8c2e8400a6b38a9b1944c893fe8758e6727d5f (patch)
tree16126462e0d0fed2c333b068daa3eb91c0e85701 /jingle
parent86e6e191af8b4f463fa6328aea67d1f95a654007 (diff)
downloadchromium_src-da8c2e8400a6b38a9b1944c893fe8758e6727d5f.zip
chromium_src-da8c2e8400a6b38a9b1944c893fe8758e6727d5f.tar.gz
chromium_src-da8c2e8400a6b38a9b1944c893fe8758e6727d5f.tar.bz2
Cleanup: Remove more unused timer.h includes.
- Fix up files that used timer.h as a crutch for other #includes. - Fix lint errors. Review URL: https://codereview.chromium.org/673393002 Cr-Commit-Position: refs/heads/master@{#301792}
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/pseudotcp_adapter.cc3
-rw-r--r--jingle/glue/pseudotcp_adapter.h5
2 files changed, 4 insertions, 4 deletions
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc
index 756dbd5..5a26f7d 100644
--- a/jingle/glue/pseudotcp_adapter.cc
+++ b/jingle/glue/pseudotcp_adapter.cc
@@ -7,6 +7,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/time/time.h"
+#include "base/timer/timer.h"
#include "net/base/address_list.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
@@ -25,7 +26,7 @@ namespace jingle_glue {
class PseudoTcpAdapter::Core : public cricket::IPseudoTcpNotify,
public base::RefCounted<Core> {
public:
- Core(net::Socket* socket);
+ explicit Core(net::Socket* socket);
// Functions used to implement net::StreamSocket.
int Read(net::IOBuffer* buffer, int buffer_size,
diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h
index 36c3fd0..b410b82 100644
--- a/jingle/glue/pseudotcp_adapter.h
+++ b/jingle/glue/pseudotcp_adapter.h
@@ -10,7 +10,6 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
-#include "base/timer/timer.h"
#include "net/base/net_log.h"
#include "net/socket/stream_socket.h"
#include "third_party/libjingle/source/talk/p2p/base/pseudotcp.h"
@@ -26,7 +25,7 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe {
public:
// Creates an adapter for the supplied Socket. |socket| should already
// be ready for use, and ownership of it will be assumed by the adapter.
- PseudoTcpAdapter(net::Socket* socket);
+ explicit PseudoTcpAdapter(net::Socket* socket);
~PseudoTcpAdapter() override;
// net::Socket implementation.
@@ -91,4 +90,4 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe {
} // namespace jingle_glue
-#endif // JINGLE_GLUE_STREAM_SOCKET_ADAPTER_H_
+#endif // JINGLE_GLUE_PSEUDOTCP_ADAPTER_H_