Index: content/child/child_io_surface_manager_mac.h |
diff --git a/content/child/child_io_surface_manager_mac.h b/content/child/child_io_surface_manager_mac.h |
index 40098e4e3a564f688411a94e056d7619630fa375..e780824dfec691bd8a1c7fd42f1d6aff8ef65be0 100644 |
--- a/content/child/child_io_surface_manager_mac.h |
+++ b/content/child/child_io_surface_manager_mac.h |
@@ -9,7 +9,7 @@ |
#include "base/macros.h" |
#include "base/memory/singleton.h" |
#include "base/synchronization/waitable_event.h" |
-#include "base/threading/platform_thread.h" |
+#include "base/threading/thread_checker.h" |
#include "content/common/mac/io_surface_manager.h" |
#include "content/common/mac/io_surface_manager_token.h" |
@@ -38,9 +38,7 @@ class CONTENT_EXPORT ChildIOSurfaceManager : public IOSurfaceManager { |
// Set the token used when communicating with the Mach service. |
void set_token(const IOSurfaceManagerToken& token) { |
token_ = token; |
-#if !defined(NDEBUG) |
- set_token_thread_id_ = base::PlatformThread::CurrentRef(); |
-#endif |
+ set_token_thread_checker_.reset(new base::ThreadChecker()); |
set_token_event_.Signal(); |
} |
@@ -52,9 +50,7 @@ class CONTENT_EXPORT ChildIOSurfaceManager : public IOSurfaceManager { |
base::mac::ScopedMachSendRight service_port_; |
IOSurfaceManagerToken token_; |
-#if !defined(NDEBUG) |
- base::PlatformThreadRef set_token_thread_id_; |
-#endif |
+ scoped_ptr<base::ThreadChecker> set_token_thread_checker_; |
base::WaitableEvent set_token_event_; |
DISALLOW_COPY_AND_ASSIGN(ChildIOSurfaceManager); |