1 files changed, 2 insertions, 4 deletions
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index 7b90be3..d784b5a 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -10,8 +10,8 @@
 #include <list>
 
 #include "base/callback.h"
-#include "base/memory/weak_ptr.h"
 #include "base/time.h"
+#include "remoting/base/scoped_thread_proxy.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/chromoting_stats.h"
 #include "remoting/client/chromoting_view.h"
@@ -120,9 +120,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
   // Keep track of the last sequence number bounced back from the host.
   int64 last_sequence_number_;
 
-  // WeakPtr used to avoid tasks accessing the client after it is deleted.
-  base::WeakPtrFactory<ChromotingClient> weak_factory_;
-  base::WeakPtr<ChromotingClient> weak_ptr_;
+  ScopedThreadProxy thread_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
 };