Index: remoting/host/remoting_me2me_host.cc |
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc |
index 1f0fc5559c79b05ce102eb7ade7d38533f68a038..b66f8376f791bea52a9ff8cc57ce6339324331d2 100644 |
--- a/remoting/host/remoting_me2me_host.cc |
+++ b/remoting/host/remoting_me2me_host.cc |
@@ -1515,9 +1515,6 @@ int HostProcessMain() { |
// Ensures runtime specific CPU features are initialized. |
media::InitializeCPUSpecificMediaFeatures(); |
- scoped_ptr<net::NetworkChangeNotifier> network_change_notifier( |
- net::NetworkChangeNotifier::Create()); |
- |
// Create the main message loop and start helper threads. |
base::MessageLoopForUI message_loop; |
scoped_ptr<ChromotingHostContext> context = |
@@ -1526,6 +1523,10 @@ int HostProcessMain() { |
if (!context) |
return kInitializationFailed; |
+ // NetworkChangeNotifier must be initialized after MessageLoop. |
+ scoped_ptr<net::NetworkChangeNotifier> network_change_notifier( |
+ net::NetworkChangeNotifier::Create()); |
+ |
// BasicURLRequestContext holds references to threads, so it needs to be |
// dereferences on UI threads. Store the reference to the URLRequestGetter to |
// make sure it's not destroyed on other threads. |