[chrome/browser/sync && sync_file_system] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/sync_file_system/sync_file_system_service.cc

 // 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.
 
 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 140 matching lines @@
         factory_(this) {}
 
   void StartSync(const SyncStatusCallback& callback) override {
     GetSyncService()->local_service_->ProcessLocalChange(
         base::Bind(&LocalSyncRunner::DidProcessLocalChange,
                    factory_.GetWeakPtr(), callback));
   }
 
   // LocalFileSyncService::Observer overrides.
   void OnLocalChangeAvailable(int64 pending_changes) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     OnChangesUpdated(pending_changes);
 
     // Kick other sync runners just in case they're not running.
     GetSyncService()->RunForEachSyncRunners(&SyncProcessRunner::Schedule);
   }
 
  private:
   void DidProcessLocalChange(
       const SyncStatusCallback& callback,
@@ skipping 29 matching lines @@
         base::Bind(&RemoteSyncRunner::DidProcessRemoteChange,
                    factory_.GetWeakPtr(), callback));
   }
 
   SyncServiceState GetServiceState() override {
     return RemoteStateToSyncServiceState(last_state_);
   }
 
   // RemoteFileSyncService::Observer overrides.
   void OnRemoteChangeQueueUpdated(int64 pending_changes) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     OnChangesUpdated(pending_changes);
 
     // Kick other sync runners just in case they're not running.
     GetSyncService()->RunForEachSyncRunners(&SyncProcessRunner::Schedule);
   }
 
   void OnRemoteServiceStateUpdated(RemoteServiceState state,
                                    const std::string& description) override {
     // Just forward to SyncFileSystemService.
@@ skipping 22 matching lines @@
   RemoteFileSyncService* remote_service_;
   RemoteServiceState last_state_;
   base::WeakPtrFactory<RemoteSyncRunner> factory_;
   DISALLOW_COPY_AND_ASSIGN(RemoteSyncRunner);
 };
 
 //-----------------------------------------------------------------------------
 // SyncFileSystemService
 
 void SyncFileSystemService::Shutdown() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   local_sync_runners_.clear();
   remote_sync_runners_.clear();
 
   local_service_->Shutdown();
   local_service_.reset();
 
   remote_service_.reset();
 
   sync_driver::SyncService* profile_sync_service =
       ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(profile_);
   if (profile_sync_service)
     profile_sync_service->RemoveObserver(this);
 
   ExtensionRegistry::Get(profile_)->RemoveObserver(this);
 
   profile_ = nullptr;
 }
 
 SyncFileSystemService::~SyncFileSystemService() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!profile_);
 }
 
 void SyncFileSystemService::InitializeForApp(
     storage::FileSystemContext* file_system_context,
     const GURL& app_origin,
     const SyncStatusCallback& callback) {
   DCHECK(local_service_);
   DCHECK(remote_service_);
   DCHECK(app_origin == app_origin.GetOrigin());
@@ skipping 153 matching lines @@
 
 SyncFileSystemService::SyncFileSystemService(Profile* profile)
     : profile_(profile),
       sync_enabled_(true),
       promoting_demoted_changes_(false) {
 }
 
 void SyncFileSystemService::Initialize(
     scoped_ptr<LocalFileSyncService> local_service,
     scoped_ptr<RemoteFileSyncService> remote_service) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(local_service);
   DCHECK(remote_service);
   DCHECK(profile_);
 
   local_service_ = local_service.Pass();
   remote_service_ = remote_service.Pass();
 
   scoped_ptr<LocalSyncRunner> local_syncer(
       new LocalSyncRunner(kLocalSyncName, this));
   scoped_ptr<RemoteSyncRunner> remote_syncer(
@@ skipping 168 matching lines @@
     bool has_pending_local_changes) {
   callback.Run(
       status,
       has_pending_local_changes ?
           SYNC_FILE_STATUS_HAS_PENDING_CHANGES : SYNC_FILE_STATUS_SYNCED);
 }
 
 void SyncFileSystemService::OnRemoteServiceStateUpdated(
     RemoteServiceState state,
     const std::string& description) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "OnRemoteServiceStateChanged: %d %s", state, description.c_str());
 
   FOR_EACH_OBSERVER(
       SyncEventObserver, observers_,
       OnSyncStateUpdated(GURL(),
                          RemoteStateToSyncServiceState(state),
                          description));
 
   RunForEachSyncRunners(&SyncProcessRunner::Schedule);
@@ skipping 109 matching lines @@
            local_sync_runners_.begin();
        iter != local_sync_runners_.end(); ++iter)
     ((*iter)->*method)();
   for (ScopedVector<SyncProcessRunner>::iterator iter =
            remote_sync_runners_.begin();
        iter != remote_sync_runners_.end(); ++iter)
     ((*iter)->*method)();
 }
 
 }  // namespace sync_file_system