Simplify channel creation callbacks in remoting::Session interface.

remoting/protocol/jingle_session_unittest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/time.h"
 #include "base/test/test_timeouts.h"
@@ skipping 363 matching lines @@
     host_session_->CreateStreamChannel(
         kChannelName,
         base::Bind(&TCPChannelTester::OnChannelReady,
                    base::Unretained(this), 0));
     client_session_->CreateStreamChannel(
         kChannelName,
         base::Bind(&TCPChannelTester::OnChannelReady,
                    base::Unretained(this), 1));
   }
 
-  void OnChannelReady(int id, const std::string name,
-                      net::StreamSocket* socket) {
+  void OnChannelReady(int id, net::StreamSocket* socket) {
     ASSERT_TRUE(socket);
-    ASSERT_EQ(name, kChannelName);
     if (!socket) {
       Done();
       return;
     }
 
     DCHECK(id >= 0 && id < 2);
     sockets_[id].reset(socket);
 
     if (sockets_[0].get() && sockets_[1].get()) {
       InitBuffers();
@@ skipping 142 matching lines @@
     host_session_->CreateDatagramChannel(
         kChannelName,
         base::Bind(&UDPChannelTester::OnChannelReady,
                    base::Unretained(this), 0));
     client_session_->CreateDatagramChannel(
         kChannelName,
         base::Bind(&UDPChannelTester::OnChannelReady,
                    base::Unretained(this), 1));
   }
 
-  void OnChannelReady(int id, const std::string name, net::Socket* socket) {
+  void OnChannelReady(int id, net::Socket* socket) {
     ASSERT_TRUE(socket);
-    ASSERT_EQ(name, kChannelName);
     if (!socket) {
       Done();
       return;
     }
 
     DCHECK(id >= 0 && id < 2);
     sockets_[id].reset(socket);
 
     if (sockets_[0].get() && sockets_[1].get()) {
       InitBuffers();
@@ skipping 216 matching lines @@
   ASSERT_TRUE(tester->WaitFinished());
   LOG(INFO) << "Time for 500k bytes "
             << tester->GetElapsedTime().InMilliseconds() << " ms.";
 
   // Connections must be closed while |tester| still exists.
   CloseSessions();
 }
 
 }  // namespace protocol
 }  // namespace remoting