Make Session and SessionManager not thread-safe and not ref-counted.

BUG=None
TEST=Unittests.

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

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

1 files changed, 7 insertions, 4 deletions

diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index 0abe34e..b05fcf6 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -6,6 +6,7 @@
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/task.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/completion_callback.h"
 #include "remoting/protocol/session.h"
@@ -52,7 +53,6 @@ class JingleSession : public protocol::Session,
   virtual net::Socket* video_rtcp_channel();
 
   virtual const std::string& jid();
-  virtual MessageLoop* message_loop();
 
   virtual const CandidateSessionConfig* candidate_config();
 
@@ -64,7 +64,7 @@ class JingleSession : public protocol::Session,
   virtual const std::string& receiver_token();
   virtual void set_receiver_token(const std::string& receiver_token);
 
-  virtual void Close(Task* closed_task);
+  virtual void Close();
 
  private:
   friend class JingleSessionManager;
@@ -138,8 +138,9 @@ class JingleSession : public protocol::Session,
 
   void SetState(State new_state);
 
-  // JingleSessionManager that created this session.
-  scoped_refptr<JingleSessionManager> jingle_session_manager_;
+  // JingleSessionManager that created this session. Guaranteed to
+  // exist throughout the lifetime of the session.
+  JingleSessionManager* jingle_session_manager_;
 
   // Certificates used for connection. Currently only receiving side
   // has a certificate.
@@ -219,6 +220,8 @@ class JingleSession : public protocol::Session,
   net::CompletionCallbackImpl<JingleSession> connect_callback_;
   net::CompletionCallbackImpl<JingleSession> ssl_connect_callback_;
 
+  ScopedRunnableMethodFactory<JingleSession> task_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };