diff options
-rw-r--r-- | chrome/browser/sync_file_system/sync_file_system_service.cc | 5 | ||||
-rw-r--r-- | chrome/browser/sync_file_system/sync_file_system_service_unittest.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc index 1876141..e6a0afc 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service.cc @@ -33,8 +33,7 @@ namespace { // are run, or may dispatch it earlier if we get an error in any of the sub // callbacks. class SharedCallbackRunner - : public base::RefCounted<SharedCallbackRunner>, - public base::NonThreadSafe { + : public base::RefCountedThreadSafe<SharedCallbackRunner> { public: explicit SharedCallbackRunner(const SyncStatusCallback& join_callback) : join_callback_(join_callback), @@ -54,7 +53,7 @@ class SharedCallbackRunner private: virtual ~SharedCallbackRunner() {} - friend class base::RefCounted<SharedCallbackRunner>; + friend class base::RefCountedThreadSafe<SharedCallbackRunner>; template <typename R> void AssignAndRun(R* out, SyncStatusCode status, const R& in) { diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc index f2a300a..2d06bfc 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc @@ -153,7 +153,7 @@ TEST_F(SyncFileSystemServiceTest, GetConflictFilesWithoutInitialize) { } } -TEST_F(SyncFileSystemServiceTest, FLAKY_GetConflictFiles) { +TEST_F(SyncFileSystemServiceTest, GetConflictFiles) { InitializeApp(); // 1. Sets up (conflicting) files. |