summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 22:56:50 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 22:56:50 +0000
commit643e0dc7cf3a242e9af0f34024e3195ac91dc33f (patch)
tree76c90a7823ee530cd1cf673793aed9997ca4eacb /remoting/protocol
parente5e77f568c6fc18da3be28ef96c6c3c33c5247f7 (diff)
downloadchromium_src-643e0dc7cf3a242e9af0f34024e3195ac91dc33f.zip
chromium_src-643e0dc7cf3a242e9af0f34024e3195ac91dc33f.tar.gz
chromium_src-643e0dc7cf3a242e9af0f34024e3195ac91dc33f.tar.bz2
Linux/ChromeOS Chromium style checker cleanup, remoting/ edition.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files. BUG=115047 Review URL: https://chromiumcodereview.appspot.com/12207034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/buffered_socket_writer_unittest.cc2
-rw-r--r--remoting/protocol/channel_multiplexer.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/protocol/buffered_socket_writer_unittest.cc b/remoting/protocol/buffered_socket_writer_unittest.cc
index e0125f2..9d60971 100644
--- a/remoting/protocol/buffered_socket_writer_unittest.cc
+++ b/remoting/protocol/buffered_socket_writer_unittest.cc
@@ -44,7 +44,7 @@ class BufferedSocketWriterTest : public testing::Test {
}
protected:
- void SetUp() OVERRIDE {
+ virtual void SetUp() OVERRIDE {
socket_.reset(new FakeSocket());
writer_.reset(new BufferedSocketWriter());
writer_->Init(socket_.get(), base::Bind(
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index e14b2b3..b0a00da 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -104,7 +104,7 @@ class ChannelMultiplexer::MuxSocket : public net::StreamSocket,
public base::SupportsWeakPtr<MuxSocket> {
public:
MuxSocket(MuxChannel* channel);
- ~MuxSocket();
+ virtual ~MuxSocket();
void OnWriteComplete();
void OnWriteFailed();