Destroy NetworkChangeNotifier on the thread on which it is created

remoting/host/remoting_me2me_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 313 matching lines @@
                          int* exit_code_out)
     : context_(context.Pass()),
       state_(HOST_INITIALIZING),
       allow_nat_traversal_(true),
       curtain_required_(false),
 #if defined(REMOTING_MULTI_PROCESS)
       desktop_session_connector_(NULL),
 #endif  // defined(REMOTING_MULTI_PROCESS)
       ALLOW_THIS_IN_INITIALIZER_LIST(self_(this)),
       exit_code_out_(exit_code_out) {
-  // Create a NetworkChangeNotifier for use by the signalling connector.
-  network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
-
   // Create the platform-specific curtain-mode implementation.
   // TODO(wez): Create this on the network thread?
   curtain_ = CurtainMode::Create(
       base::Bind(&HostProcess::OnRemoteSessionSwitchedToConsole,
                  base::Unretained(this)),
       base::Bind(&HostProcess::OnCurtainModeFailed,
                  base::Unretained(this)));
 
   StartOnUiThread();
 }
@@ skipping 559 matching lines @@
 
   signal_strategy_.reset(
       new XmppSignalStrategy(context_->url_request_context_getter(),
                              xmpp_login_, xmpp_auth_token_,
                              xmpp_auth_service_, xmpp_server_config_));
 
   scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker(
       new DnsBlackholeChecker(context_->url_request_context_getter(),
                               talkgadget_prefix_));
 
+  // Create a NetworkChangeNotifier for use by the signaling connector.
+  network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+
   signaling_connector_.reset(new SignalingConnector(
       signal_strategy_.get(),
       context_->url_request_context_getter(),
       dns_blackhole_checker.Pass(),
       base::Bind(&HostProcess::OnAuthFailed, this)));
 
   if (!oauth_refresh_token_.empty()) {
     scoped_ptr<SignalingConnector::OAuthCredentials> oauth_credentials(
         new SignalingConnector::OAuthCredentials(
             xmpp_login_, oauth_refresh_token_));
@@ skipping 139 matching lines @@
   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
 
   host_ = NULL;
   curtaining_host_observer_.reset();
   host_event_logger_.reset();
   log_to_server_.reset();
   heartbeat_sender_.reset();
   host_change_notification_listener_.reset();
   signaling_connector_.reset();
   signal_strategy_.reset();
+  network_change_notifier_.reset();
 
   if (state_ == HOST_STOPPING_TO_RESTART) {
     StartHost();
   } else if (state_ == HOST_STOPPING) {
     state_ = HOST_STOPPED;
 
     if (policy_watcher_.get()) {
       base::WaitableEvent done_event(true, false);
       policy_watcher_->StopWatching(&done_event);
       done_event.Wait();
@@ skipping 59 matching lines @@
   return exit_code;
 }
 
 }  // namespace remoting
 
 #if !defined(OS_WIN)
 int main(int argc, char** argv) {
   return remoting::HostMain(argc, argv);
 }
 #endif  // !defined(OS_WIN)