Hookup the ChromotingPlugin into the refactored implementation

of HostConnection and ChromotingView.  Also implement a bare-bones
PepperView.

No unittests yet. Still too in flux to be worth it.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/2852003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50116 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 9 deletions

diff --git a/remoting/client/jingle_host_connection.h b/remoting/client/jingle_host_connection.h
index 00faaa1..96178aa 100644
--- a/remoting/client/jingle_host_connection.h
+++ b/remoting/client/jingle_host_connection.h
@@ -20,6 +20,7 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/task.h"
 #include "remoting/base/protocol_decoder.h"
 #include "remoting/client/host_connection.h"
 #include "remoting/jingle_glue/jingle_channel.h"
@@ -31,19 +32,17 @@ namespace remoting {
 
 class JingleThread;
 
-class JingleHostConnection :
-    public base::RefCountedThreadSafe<JingleHostConnection>,
-    public HostConnection,
-    public JingleChannel::Callback,
-    public JingleClient::Callback {
+class JingleHostConnection : public HostConnection,
+                             public JingleChannel::Callback,
+                             public JingleClient::Callback {
  public:
-  JingleHostConnection(JingleThread* network_thread,
-                       HostEventCallback* event_callback);
+  explicit JingleHostConnection(JingleThread* network_thread);
   virtual ~JingleHostConnection();
 
   virtual void Connect(const std::string& username,
                        const std::string& auth_token,
-                       const std::string& host_jid);
+                       const std::string& host_jid,
+                       HostEventCallback* event_callback);
   virtual void Disconnect();
 
   // JingleChannel::Callback interface.
@@ -64,7 +63,8 @@ class JingleHostConnection :
 
   void DoConnect(const std::string& username,
                  const std::string& auth_token,
-                 const std::string& host_jid);
+                 const std::string& host_jid,
+                 HostEventCallback* event_callback);
   void DoDisconnect();
 
   JingleThread* network_thread_;
@@ -80,4 +80,6 @@ class JingleHostConnection :
 
 }  // namespace remoting
 
+DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::JingleHostConnection);
+
 #endif  // REMOTING_CLIENT_JINGLE_HOST_CONNECTION_H_