diff options
10 files changed, 51 insertions, 51 deletions
diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper.cc b/components/autofill/content/browser/wallet/wallet_signin_helper.cc index fc9b66f..92a228d 100644 --- a/components/autofill/content/browser/wallet/wallet_signin_helper.cc +++ b/components/autofill/content/browser/wallet/wallet_signin_helper.cc @@ -38,7 +38,7 @@ const char kWalletCookieName[] = "gdtoken"; void GetGoogleCookiesCallback( const base::Callback<void(const std::string&)>& callback, const net::CookieList& cookies) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); // Cookies for parent domains will also be returned; we only want cookies with // exact host matches. TODO(estade): really? @@ -62,7 +62,7 @@ void GetGoogleCookiesCallback( void GetGoogleCookies( scoped_refptr<net::URLRequestContextGetter> request_context_getter, const base::Callback<void(const std::string&)>& callback) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); net::URLRequestContext* url_request_context = request_context_getter->GetURLRequestContext(); @@ -166,7 +166,7 @@ void WalletSigninHelper::OnURLFetchComplete( void WalletSigninHelper::ReturnWalletCookieValue( const std::string& cookie_value) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); delegate_->OnDidFetchWalletCookieValue(cookie_value); } diff --git a/components/crash/browser/crash_dump_manager_android.cc b/components/crash/browser/crash_dump_manager_android.cc index 4814afd..a6df1d9 100644 --- a/components/crash/browser/crash_dump_manager_android.cc +++ b/components/crash/browser/crash_dump_manager_android.cc @@ -57,7 +57,7 @@ CrashDumpManager::~CrashDumpManager() { } base::File CrashDumpManager::CreateMinidumpFile(int child_process_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER)); + DCHECK_CURRENTLY_ON(BrowserThread::PROCESS_LAUNCHER); base::FilePath minidump_path; if (!base::CreateTemporaryFile(&minidump_path)) return base::File(); diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle.cc index cc340ca..1b00b19 100644 --- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle.cc +++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle.cc @@ -45,7 +45,7 @@ DataReductionProxyDebugResourceThrottle::MaybeCreate( void DataReductionProxyDebugResourceThrottle::StartDisplayingBlockingPage( scoped_refptr<DataReductionProxyDebugUIManager> ui_manager, const DataReductionProxyDebugUIManager::BypassResource& resource) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); ui_manager->DisplayBlockingPage(resource); } diff --git a/components/nacl/browser/nacl_browser.cc b/components/nacl/browser/nacl_browser.cc index f53b3e0..733e9d9 100644 --- a/components/nacl/browser/nacl_browser.cc +++ b/components/nacl/browser/nacl_browser.cc @@ -168,7 +168,7 @@ NaClBrowserDelegate* NaClBrowser::GetDelegate() { } void NaClBrowser::EarlyStartup() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); InitIrtFilePath(); InitValidationCacheFilePath(); } @@ -225,21 +225,21 @@ bool NaClBrowser::IsOk() const { } const base::File& NaClBrowser::IrtFile() const { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); CHECK_EQ(irt_state_, NaClResourceReady); CHECK(irt_file_.IsValid()); return irt_file_; } void NaClBrowser::EnsureAllResourcesAvailable() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); EnsureIrtAvailable(); EnsureValidationCacheAvailable(); } // Load the IRT async. void NaClBrowser::EnsureIrtAvailable() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (IsOk() && irt_state_ == NaClResourceUninitialized) { irt_state_ = NaClResourceRequested; // TODO(ncbray) use blocking pool. @@ -260,7 +260,7 @@ void NaClBrowser::EnsureIrtAvailable() { void NaClBrowser::OnIrtOpened(scoped_ptr<base::FileProxy> file_proxy, base::File::Error error_code) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); DCHECK_EQ(irt_state_, NaClResourceRequested); if (file_proxy->IsValid()) { irt_file_ = file_proxy->TakeFile(); @@ -322,7 +322,7 @@ void NaClBrowser::InitValidationCacheFilePath() { } void NaClBrowser::EnsureValidationCacheAvailable() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (IsOk() && validation_cache_state_ == NaClResourceUninitialized) { if (ValidationCacheIsEnabled()) { validation_cache_state_ = NaClResourceRequested; @@ -347,7 +347,7 @@ void NaClBrowser::EnsureValidationCacheAvailable() { } void NaClBrowser::OnValidationCacheLoaded(const std::string *data) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); // Did the cache get cleared before the load completed? If so, ignore the // incoming data. if (validation_cache_state_ == NaClResourceReady) @@ -373,7 +373,7 @@ void NaClBrowser::RunWithoutValidationCache() { } void NaClBrowser::CheckWaiting() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (!IsOk() || IsReady()) { // Queue the waiting tasks into the message loop. This helps avoid // re-entrancy problems that could occur if the closure was invoked @@ -404,7 +404,7 @@ const base::FilePath& NaClBrowser::GetIrtFilePath() { void NaClBrowser::PutFilePath(const base::FilePath& path, uint64* file_token_lo, uint64* file_token_hi) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); while (true) { uint64 file_token[2] = {base::RandUint64(), base::RandUint64()}; // A zero file_token indicates there is no file_token, if we get zero, ask @@ -425,7 +425,7 @@ void NaClBrowser::PutFilePath(const base::FilePath& path, uint64* file_token_lo, bool NaClBrowser::GetFilePath(uint64 file_token_lo, uint64 file_token_hi, base::FilePath* path) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); uint64 file_token[2] = {file_token_lo, file_token_hi}; std::string key(reinterpret_cast<char*>(file_token), sizeof(file_token)); PathCacheType::iterator iter = path_cache_.Peek(key); @@ -441,7 +441,7 @@ bool NaClBrowser::GetFilePath(uint64 file_token_lo, uint64 file_token_hi, bool NaClBrowser::QueryKnownToValidate(const std::string& signature, bool off_the_record) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (off_the_record) { // If we're off the record, don't reorder the main cache. return validation_cache_.QueryKnownToValidate(signature, false) || @@ -457,7 +457,7 @@ bool NaClBrowser::QueryKnownToValidate(const std::string& signature, void NaClBrowser::SetKnownToValidate(const std::string& signature, bool off_the_record) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (off_the_record) { off_the_record_validation_cache_.SetKnownToValidate(signature); } else { @@ -470,7 +470,7 @@ void NaClBrowser::SetKnownToValidate(const std::string& signature, } void NaClBrowser::ClearValidationCache(const base::Closure& callback) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); // Note: this method may be called before EnsureValidationCacheAvailable has // been invoked. In other words, this method may be called before any NaCl // processes have been created. This method must succeed and invoke the @@ -522,7 +522,7 @@ void NaClBrowser::MarkValidationCacheAsModified() { } void NaClBrowser::PersistValidationCache() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); // validation_cache_is_modified_ may be false if the cache was cleared while // this delayed task was pending. // validation_cache_file_path_ may be empty if something went wrong during @@ -549,7 +549,7 @@ void NaClBrowser::OnProcessEnd(int process_id) { } void NaClBrowser::OnProcessCrashed() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (crash_times_.size() == kMaxCrashesPerInterval) { crash_times_.pop_front(); } @@ -558,7 +558,7 @@ void NaClBrowser::OnProcessCrashed() { } bool NaClBrowser::IsThrottled() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (crash_times_.size() != kMaxCrashesPerInterval) { return false; } diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc index 3640e8f..8855f42 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc @@ -119,7 +119,7 @@ class TestIOThreadState { url, net::DEFAULT_PRIORITY, NULL /* delegate */)) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (render_process_id != MSG_ROUTING_NONE && render_frame_id != MSG_ROUTING_NONE) { content::ResourceRequestInfo::AllocateForTesting( @@ -150,13 +150,13 @@ class TestIOThreadState { } void ThrottleWillStartRequest(bool* defer) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); throttle_->WillStartRequest(defer); } void ThrottleWillRedirectRequest(const net::RedirectInfo& redirect_info, bool* defer) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); throttle_->WillRedirectRequest(redirect_info, defer); } @@ -211,7 +211,7 @@ class InterceptNavigationResourceThrottleTest int render_process_id, int render_frame_id, bool* defer) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); TestIOThreadState* io_thread_state = new TestIOThreadState(url, render_process_id, render_frame_id, request_method, redirect_mode, diff --git a/components/storage_monitor/image_capture_device.mm b/components/storage_monitor/image_capture_device.mm index 1008bfd..29285d9 100644 --- a/components/storage_monitor/image_capture_device.mm +++ b/components/storage_monitor/image_capture_device.mm @@ -13,7 +13,7 @@ namespace { base::File::Error RenameFile(const base::FilePath& downloaded_filename, const base::FilePath& desired_filename) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); bool success = base::ReplaceFile(downloaded_filename, desired_filename, NULL); return success ? base::File::FILE_OK : base::File::FILE_ERROR_NOT_FOUND; } @@ -22,7 +22,7 @@ void ReturnRenameResultToListener( base::WeakPtr<ImageCaptureDeviceListener> listener, const std::string& name, const base::File::Error& result) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (listener) listener->DownloadedFile(name, result); } @@ -75,18 +75,18 @@ base::FilePath PathForCameraItem(ICCameraItem* item) { - (void)setListener:(base::WeakPtr<storage_monitor::ImageCaptureDeviceListener>) listener { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); listener_ = listener; } - (void)open { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(listener_); [camera_ requestOpenSession]; } - (void)close { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); closing_ = true; [camera_ cancelDownload]; [camera_ requestCloseSession]; @@ -100,7 +100,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) { - (void)downloadFile:(const std::string&)name localPath:(const base::FilePath&)localPath { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); // Find the file with that name and start download. for (ICCameraItem* item in [camera_ mediaFiles]) { diff --git a/components/storage_monitor/mtab_watcher_linux.cc b/components/storage_monitor/mtab_watcher_linux.cc index 00a9d0c..31dda98 100644 --- a/components/storage_monitor/mtab_watcher_linux.cc +++ b/components/storage_monitor/mtab_watcher_linux.cc @@ -38,7 +38,7 @@ MtabWatcherLinux::MtabWatcherLinux(const base::FilePath& mtab_path, : mtab_path_(mtab_path), delegate_(delegate), weak_ptr_factory_(this) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); bool ret = file_watcher_.Watch( mtab_path_, false, base::Bind(&MtabWatcherLinux::OnFilePathChanged, @@ -52,11 +52,11 @@ MtabWatcherLinux::MtabWatcherLinux(const base::FilePath& mtab_path, } MtabWatcherLinux::~MtabWatcherLinux() { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); } void MtabWatcherLinux::ReadMtab() const { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); FILE* fp = setmntent(mtab_path_.value().c_str(), "r"); if (!fp) @@ -87,7 +87,7 @@ void MtabWatcherLinux::ReadMtab() const { void MtabWatcherLinux::OnFilePathChanged( const base::FilePath& path, bool error) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); if (path != mtab_path_) { // This cannot happen unless FilePathWatcher is buggy. Just ignore this diff --git a/components/storage_monitor/portable_device_watcher_win.cc b/components/storage_monitor/portable_device_watcher_win.cc index 3f90fee..8095a89 100644 --- a/components/storage_monitor/portable_device_watcher_win.cc +++ b/components/storage_monitor/portable_device_watcher_win.cc @@ -489,7 +489,7 @@ PortableDeviceWatcherWin::~PortableDeviceWatcherWin() { } void PortableDeviceWatcherWin::Init(HWND hwnd) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); notifications_ = RegisterPortableDeviceNotification(hwnd); base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); media_task_runner_ = pool->GetSequencedTaskRunnerWithShutdownBehavior( @@ -499,7 +499,7 @@ void PortableDeviceWatcherWin::Init(HWND hwnd) { } void PortableDeviceWatcherWin::OnWindowMessage(UINT event_type, LPARAM data) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (!IsPortableDeviceStructure(data)) return; @@ -514,7 +514,7 @@ bool PortableDeviceWatcherWin::GetMTPStorageInfoFromDeviceId( const std::string& storage_device_id, base::string16* device_location, base::string16* storage_object_id) const { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(device_location); DCHECK(storage_object_id); MTPStorageMap::const_iterator storage_map_iter = @@ -573,7 +573,7 @@ void PortableDeviceWatcherWin::EjectDevice( void PortableDeviceWatcherWin::EnumerateAttachedDevices() { DCHECK(media_task_runner_.get()); - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); Devices* devices = new Devices; base::PostTaskAndReplyWithResult( media_task_runner_.get(), FROM_HERE, @@ -584,7 +584,7 @@ void PortableDeviceWatcherWin::EnumerateAttachedDevices() { void PortableDeviceWatcherWin::OnDidEnumerateAttachedDevices( const Devices* devices, const bool result) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(devices); if (!result) return; @@ -597,7 +597,7 @@ void PortableDeviceWatcherWin::OnDidEnumerateAttachedDevices( void PortableDeviceWatcherWin::HandleDeviceAttachEvent( const base::string16& pnp_device_id) { DCHECK(media_task_runner_.get()); - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DeviceDetails* device_details = new DeviceDetails; base::PostTaskAndReplyWithResult( media_task_runner_.get(), FROM_HERE, @@ -609,7 +609,7 @@ void PortableDeviceWatcherWin::HandleDeviceAttachEvent( void PortableDeviceWatcherWin::OnDidHandleDeviceAttachEvent( const DeviceDetails* device_details, const bool result) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(device_details); if (!result) return; @@ -646,7 +646,7 @@ void PortableDeviceWatcherWin::OnDidHandleDeviceAttachEvent( void PortableDeviceWatcherWin::HandleDeviceDetachEvent( const base::string16& pnp_device_id) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); MTPDeviceMap::iterator device_iter = device_map_.find(pnp_device_id); if (device_iter == device_map_.end()) return; diff --git a/components/storage_monitor/storage_monitor_chromeos.cc b/components/storage_monitor/storage_monitor_chromeos.cc index 92e7cfd..6227ee0 100644 --- a/components/storage_monitor/storage_monitor_chromeos.cc +++ b/components/storage_monitor/storage_monitor_chromeos.cc @@ -79,7 +79,7 @@ bool GetDeviceInfo(const DiskMountManager::MountPointInfo& mount_info, // Returns whether the mount point in |mount_info| is a media device or not. bool CheckMountedPathOnFileThread( const DiskMountManager::MountPointInfo& mount_info) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); return MediaStorageUtil::HasDcim(base::FilePath(mount_info.mount_path)); } @@ -115,7 +115,7 @@ void StorageMonitorCros::Init() { } void StorageMonitorCros::CheckExistingMountPoints() { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); const DiskMountManager::MountPointMap& mount_point_map = DiskMountManager::GetInstance()->mount_points(); for (DiskMountManager::MountPointMap::const_iterator it = @@ -148,7 +148,7 @@ void StorageMonitorCros::OnMountEvent( DiskMountManager::MountEvent event, chromeos::MountError error_code, const DiskMountManager::MountPointInfo& mount_info) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); // Ignore mount points that are not devices. if (mount_info.mount_type != chromeos::MOUNT_TYPE_DEVICE) @@ -277,7 +277,7 @@ StorageMonitorCros::media_transfer_protocol_manager() { void StorageMonitorCros::AddMountedPath( const DiskMountManager::MountPointInfo& mount_info, bool has_dcim) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (ContainsKey(mount_map_, mount_info.mount_path)) { // CheckExistingMountPointsOnUIThread() added the mount point information diff --git a/components/storage_monitor/storage_monitor_mac.mm b/components/storage_monitor/storage_monitor_mac.mm index d8055dc..22a884b 100644 --- a/components/storage_monitor/storage_monitor_mac.mm +++ b/components/storage_monitor/storage_monitor_mac.mm @@ -47,7 +47,7 @@ StorageInfo::Type GetDeviceType(bool is_removable, bool has_dcim) { StorageInfo BuildStorageInfo( CFDictionaryRef dict, std::string* bsd_name) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); CFStringRef device_bsd_name = base::mac::GetValueFromDictionary<CFStringRef>( dict, kDADiskDescriptionMediaBSDNameKey); @@ -109,7 +109,7 @@ void GetDiskInfoAndUpdateOnFileThread( const base::WeakPtr<StorageMonitorMac>& monitor, base::ScopedCFTypeRef<CFDictionaryRef> dict, StorageMonitorMac::UpdateType update_type) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); std::string bsd_name; StorageInfo info = BuildStorageInfo(dict, &bsd_name); @@ -209,7 +209,7 @@ void StorageMonitorMac::UpdateDisk( const std::string& bsd_name, const StorageInfo& info, UpdateType update_type) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); pending_disk_updates_--; bool initialization_complete = false; @@ -348,7 +348,7 @@ void StorageMonitorMac::DiskDescriptionChangedCallback(DADiskRef disk, void StorageMonitorMac::GetDiskInfoAndUpdate( DADiskRef disk, StorageMonitorMac::UpdateType update_type) { - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); pending_disk_updates_++; |