Revert 96089 - Remove video_channel() from Session interface

remoting/protocol/protobuf_video_writer.h

Index: remoting/protocol/protobuf_video_writer.h
===================================================================
--- remoting/protocol/protobuf_video_writer.h	(revision 96105)
+++ remoting/protocol/protobuf_video_writer.h	(working copy)
@@ -5,17 +5,10 @@
 #ifndef REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_
 #define REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_
 
-#include <string>
-
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/video_writer.h"
 
-namespace net {
-class StreamSocket;
-}  // namespace net
-
 namespace remoting {
 namespace protocol {
 
@@ -28,8 +21,7 @@
   virtual ~ProtobufVideoWriter();
 
   // VideoWriter interface.
-  virtual void Init(protocol::Session* session,
-                    const InitializedCallback& callback) OVERRIDE;
+  virtual void Init(protocol::Session* session) OVERRIDE;
   virtual void Close() OVERRIDE;
 
   // VideoStub interface.
@@ -38,13 +30,6 @@
   virtual int GetPendingPackets() OVERRIDE;
 
  private:
-  void OnChannelReady(const std::string& name, net::StreamSocket* socket);
-
-  InitializedCallback initialized_callback_;
-
-  // TODO(sergeyu): Remove |channel_| and let |buffered_writer_| own it.
-  scoped_ptr<net::StreamSocket> channel_;
-
   scoped_refptr<BufferedSocketWriter> buffered_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtobufVideoWriter);