summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/jingle_session_manager.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 23:07:05 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 23:07:05 +0000
commit60fc9600a685d2e8c29c9ad81b167549fb223fd3 (patch)
tree1b9fac808def5132230fa240066540640951b5bc /remoting/protocol/jingle_session_manager.cc
parent28b50a7b55c56a941f948fc4e8de8c06cb46fc3c (diff)
downloadchromium_src-60fc9600a685d2e8c29c9ad81b167549fb223fd3.zip
chromium_src-60fc9600a685d2e8c29c9ad81b167549fb223fd3.tar.gz
chromium_src-60fc9600a685d2e8c29c9ad81b167549fb223fd3.tar.bz2
Use MessageLoopProxy for network message loop.
When we switch to P2P Pepper API we will need to run networking code on the main plugin thread. Switching to MessageLoopProxy for network thread, so that it's easier to switch network thread in the future. BUG=None TEST=None Review URL: http://codereview.chromium.org/7633009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session_manager.cc')
-rw-r--r--remoting/protocol/jingle_session_manager.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index c4ff55a..1dae59d 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -7,7 +7,7 @@
#include <limits>
#include "base/bind.h"
-#include "base/message_loop.h"
+#include "base/message_loop_proxy.h"
#include "base/string_util.h"
#include "base/task.h"
#include "remoting/base/constants.h"
@@ -29,27 +29,31 @@ namespace remoting {
namespace protocol {
// static
-JingleSessionManager* JingleSessionManager::CreateNotSandboxed() {
- return new JingleSessionManager(NULL, NULL, NULL, NULL);
+JingleSessionManager* JingleSessionManager::CreateNotSandboxed(
+ base::MessageLoopProxy* message_loop) {
+ return new JingleSessionManager(message_loop, NULL, NULL, NULL, NULL);
}
// static
JingleSessionManager* JingleSessionManager::CreateSandboxed(
+ base::MessageLoopProxy* message_loop,
talk_base::NetworkManager* network_manager,
talk_base::PacketSocketFactory* socket_factory,
HostResolverFactory* host_resolver_factory,
PortAllocatorSessionFactory* port_allocator_session_factory) {
- return new JingleSessionManager(network_manager, socket_factory,
+ return new JingleSessionManager(message_loop, network_manager, socket_factory,
host_resolver_factory,
port_allocator_session_factory);
}
JingleSessionManager::JingleSessionManager(
+ base::MessageLoopProxy* message_loop,
talk_base::NetworkManager* network_manager,
talk_base::PacketSocketFactory* socket_factory,
HostResolverFactory* host_resolver_factory,
PortAllocatorSessionFactory* port_allocator_session_factory)
- : network_manager_(network_manager),
+ : message_loop_(message_loop),
+ network_manager_(network_manager),
socket_factory_(socket_factory),
host_resolver_factory_(host_resolver_factory),
port_allocator_session_factory_(port_allocator_session_factory),