Replace ScopedThreadProxy with MessageLoopProxy & WeakPtrs.

remoting/host/host_user_interface.h

 // 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.
 
 #ifndef REMOTING_HOST_HOST_USER_INTERFACE_H_
 #define REMOTING_HOST_HOST_USER_INTERFACE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-
-#include "remoting/base/scoped_thread_proxy.h"
+#include "base/memory/weak_ptr.h"
+#include "base/message_loop_proxy.h"
 #include "remoting/host/host_status_observer.h"
 
 namespace remoting {
 
 class ChromotingHost;
 class ChromotingHostContext;
 class DisconnectWindow;
 class LocalInputMonitor;
 class SignalStrategy;
 
@@ skipping 62 matching lines @@
 
   // Provide a user interface allowing the host user to close the connection.
   scoped_ptr<DisconnectWindow> disconnect_window_;
 
   // Monitor local inputs to allow remote inputs to be blocked while the local
   // user is trying to do something.
   scoped_ptr<LocalInputMonitor> local_input_monitor_;
 
   bool is_monitoring_local_inputs_;
 
-  ScopedThreadProxy ui_thread_proxy_;
+  // WeakPtr used to avoid tasks accessing the client after it is deleted.
+  base::WeakPtrFactory<HostUserInterface> weak_factory_;
+  base::WeakPtr<HostUserInterface> weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(HostUserInterface);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HOST_USER_INTERFACE_H_