| Index: remoting/protocol/jingle_session_manager.h
|
| diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
|
| index 809a3e1af0f90159a1a5003a0a8c791f22d75e16..35ad26d59d7e9396b73e34fdbe1a133de1e6f4e1 100644
|
| --- a/remoting/protocol/jingle_session_manager.h
|
| +++ b/remoting/protocol/jingle_session_manager.h
|
| @@ -39,8 +39,10 @@ class JingleSessionManager
|
| public:
|
| virtual ~JingleSessionManager();
|
|
|
| - static JingleSessionManager* CreateNotSandboxed();
|
| + static JingleSessionManager* CreateNotSandboxed(
|
| + base::MessageLoopProxy* message_loop);
|
| static JingleSessionManager* CreateSandboxed(
|
| + base::MessageLoopProxy* message_loop,
|
| talk_base::NetworkManager* network_manager,
|
| talk_base::PacketSocketFactory* socket_factory,
|
| HostResolverFactory* host_resolver_factory,
|
| @@ -81,6 +83,7 @@ class JingleSessionManager
|
| friend class JingleSession;
|
|
|
| JingleSessionManager(
|
| + base::MessageLoopProxy* message_loop,
|
| talk_base::NetworkManager* network_manager,
|
| talk_base::PacketSocketFactory* socket_factory,
|
| HostResolverFactory* host_resolver_factory,
|
| @@ -109,6 +112,8 @@ class JingleSessionManager
|
| const CandidateSessionConfig* candidate_config,
|
| const std::string& certificate);
|
|
|
| + scoped_refptr<base::MessageLoopProxy> message_loop_;
|
| +
|
| scoped_ptr<talk_base::NetworkManager> network_manager_;
|
| scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
|
| scoped_ptr<HostResolverFactory> host_resolver_factory_;
|
|
|