Cleanup channel dispatchers

remoting/protocol/message_reader_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 49 matching lines @@
     task.Run();
   }
 
   // Used by the DeleteFromCallback() test.
   void DeleteReader(const base::Closure& task) {
     reader_.reset();
     task.Run();
   }
 
  protected:
-  void SetUp() override { reader_.reset(new MessageReader()); }
+  void SetUp() override {
+    reader_.reset(new MessageReader());
+  }
 
   void TearDown() override { STLDeleteElements(&messages_); }
 
   void InitReader() {
-    reader_->Init(&socket_, base::Bind(
-        &MessageReaderTest::OnMessage, base::Unretained(this)));
+    reader_->SetMessageReceivedCallback(
+        base::Bind(&MessageReaderTest::OnMessage, base::Unretained(this)));
+    reader_->StartReading(&socket_);
   }
 
   void AddMessage(const std::string& message) {
     std::string data = std::string(4, ' ') + message;
     rtc::SetBE32(const_cast<char*>(data.data()), message.size());
 
     socket_.AppendInputData(data);
   }
 
   bool CompareResult(CompoundBuffer* buffer, const std::string& expected) {
@@ skipping 227 matching lines @@
   EXPECT_CALL(callback_, OnMessage(_))
       .Times(1)
       .WillOnce(Invoke(this, &MessageReaderTest::DeleteReader));
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace protocol
 }  // namespace remoting