4 files changed, 10 insertions, 11 deletions
diff --git a/sync/test/engine/fake_model_worker.cc b/sync/test/engine/fake_model_worker.cc
index 9938e08..3c254f5 100644
--- a/sync/test/engine/fake_model_worker.cc
+++ b/sync/test/engine/fake_model_worker.cc
@@ -13,18 +13,18 @@ FakeModelWorker::~FakeModelWorker() {
   // multi-threaded test; since ModelSafeWorkers are
   // RefCountedThreadSafe, they could theoretically be destroyed from
   // a different thread.
-  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
 }
 
 SyncerError FakeModelWorker::DoWorkAndWaitUntilDone(
     const WorkCallback& work) {
-  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   // Simply do the work on the current thread.
   return work.Run();
 }
 
 ModelSafeGroup FakeModelWorker::GetModelSafeGroup() {
-  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   return group_;
 }
 
diff --git a/sync/test/engine/fake_model_worker.h b/sync/test/engine/fake_model_worker.h
index 72ad59e..59a9e0b 100644
--- a/sync/test/engine/fake_model_worker.h
+++ b/sync/test/engine/fake_model_worker.h
@@ -18,7 +18,7 @@ namespace browser_sync {
 
 // Fake implementation of ModelSafeWorker that does work on the
 // current thread regardless of the group.
-class FakeModelWorker : public ModelSafeWorker {
+class FakeModelWorker : public ModelSafeWorker, public base::NonThreadSafe {
  public:
   explicit FakeModelWorker(ModelSafeGroup group);
 
@@ -30,8 +30,6 @@ class FakeModelWorker : public ModelSafeWorker {
  private:
   virtual ~FakeModelWorker();
 
-  base::NonThreadSafe non_thread_safe_;
-
   const ModelSafeGroup group_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeModelWorker);
diff --git a/sync/test/fake_extensions_activity_monitor.cc b/sync/test/fake_extensions_activity_monitor.cc
index b3e38cd..4cf5042 100644
--- a/sync/test/fake_extensions_activity_monitor.cc
+++ b/sync/test/fake_extensions_activity_monitor.cc
@@ -11,17 +11,17 @@ namespace browser_sync {
 FakeExtensionsActivityMonitor::FakeExtensionsActivityMonitor() {}
 
 FakeExtensionsActivityMonitor::~FakeExtensionsActivityMonitor() {
-  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
 }
 
 void FakeExtensionsActivityMonitor::GetAndClearRecords(Records* buffer) {
-  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   buffer->clear();
   buffer->swap(records_);
 }
 
 void FakeExtensionsActivityMonitor::PutRecords(const Records& records) {
-  DCHECK(non_thread_safe_.CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   for (Records::const_iterator i = records.begin(); i != records.end(); ++i) {
     records_[i->first].extension_id = i->second.extension_id;
     records_[i->first].bookmark_write_count += i->second.bookmark_write_count;
diff --git a/sync/test/fake_extensions_activity_monitor.h b/sync/test/fake_extensions_activity_monitor.h
index 2beb64f..4152bf7 100644
--- a/sync/test/fake_extensions_activity_monitor.h
+++ b/sync/test/fake_extensions_activity_monitor.h
@@ -14,7 +14,9 @@ namespace browser_sync {
 
 // Fake non-thread-safe implementation of ExtensionsActivityMonitor
 // suitable to be used in single-threaded sync tests.
-class FakeExtensionsActivityMonitor : public ExtensionsActivityMonitor {
+class FakeExtensionsActivityMonitor
+    : public ExtensionsActivityMonitor,
+      public base::NonThreadSafe {
  public:
   FakeExtensionsActivityMonitor();
   virtual ~FakeExtensionsActivityMonitor();
@@ -25,7 +27,6 @@ class FakeExtensionsActivityMonitor : public ExtensionsActivityMonitor {
 
  private:
   Records records_;
-  base::NonThreadSafe non_thread_safe_;
 };
 
 }  // namespace browser_sync