diff options
38 files changed, 228 insertions, 228 deletions
diff --git a/content/browser/android/download_controller_android_impl.cc b/content/browser/android/download_controller_android_impl.cc index cf95e04..353e261 100644 --- a/content/browser/android/download_controller_android_impl.cc +++ b/content/browser/android/download_controller_android_impl.cc @@ -98,7 +98,7 @@ void DownloadControllerAndroidImpl::CancelDeferredDownload( void DownloadControllerAndroidImpl::CreateGETDownload( int render_process_id, int render_view_id, int request_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); GlobalRequestID global_id(render_process_id, request_id); // We are yielding the UI thread and render_view_host may go away by @@ -118,7 +118,7 @@ void DownloadControllerAndroidImpl::CreateGETDownload( void DownloadControllerAndroidImpl::PrepareDownloadInfo( const GlobalRequestID& global_id, const GetDownloadInfoCB& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); net::URLRequest* request = ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id); @@ -150,7 +150,7 @@ void DownloadControllerAndroidImpl::PrepareDownloadInfo( void DownloadControllerAndroidImpl::CheckPolicyAndLoadCookies( const DownloadInfoAndroid& info, const GetDownloadInfoCB& callback, const GlobalRequestID& global_id, const net::CookieList& cookie_list) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); net::URLRequest* request = ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id); @@ -170,7 +170,7 @@ void DownloadControllerAndroidImpl::CheckPolicyAndLoadCookies( void DownloadControllerAndroidImpl::DoLoadCookies( const DownloadInfoAndroid& info, const GetDownloadInfoCB& callback, const GlobalRequestID& global_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); net::CookieOptions options; options.set_include_httponly(); @@ -201,7 +201,7 @@ void DownloadControllerAndroidImpl::OnCookieResponse( void DownloadControllerAndroidImpl::StartDownloadOnUIThread( const GetDownloadInfoCB& callback, const DownloadInfoAndroid& info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(callback, info)); } @@ -209,7 +209,7 @@ void DownloadControllerAndroidImpl::StartDownloadOnUIThread( void DownloadControllerAndroidImpl::StartAndroidDownload( int render_process_id, int render_view_id, const DownloadInfoAndroid& info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); JNIEnv* env = base::android::AttachCurrentThread(); // Call newHttpGetDownload @@ -260,7 +260,7 @@ void DownloadControllerAndroidImpl::StartAndroidDownload( void DownloadControllerAndroidImpl::OnDownloadStarted( DownloadItem* download_item) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!download_item->GetWebContents()) return; @@ -285,7 +285,7 @@ void DownloadControllerAndroidImpl::OnDownloadStarted( } void DownloadControllerAndroidImpl::OnDownloadUpdated(DownloadItem* item) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (item->IsDangerous() && (item->GetState() != DownloadItem::CANCELLED)) OnDangerousDownload(item); diff --git a/content/browser/android/in_process/synchronous_input_event_filter.cc b/content/browser/android/in_process/synchronous_input_event_filter.cc index 2122a90..2b295da 100644 --- a/content/browser/android/in_process/synchronous_input_event_filter.cc +++ b/content/browser/android/in_process/synchronous_input_event_filter.cc @@ -41,7 +41,7 @@ void SynchronousInputEventFilter::SetBoundHandler(const Handler& handler) { void SynchronousInputEventFilter::SetBoundHandlerOnUIThread( const Handler& handler) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); handler_ = handler; } diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc index e4dbf7e..c3cdf16 100644 --- a/content/browser/appcache/chrome_appcache_service.cc +++ b/content/browser/appcache/chrome_appcache_service.cc @@ -25,7 +25,7 @@ void ChromeAppCacheService::InitializeOnIOThread( ResourceContext* resource_context, net::URLRequestContextGetter* request_context_getter, scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); cache_path_ = cache_path; resource_context_ = resource_context; @@ -51,7 +51,7 @@ void ChromeAppCacheService::InitializeOnIOThread( bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url, const GURL& first_party) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); // We don't prompt for read access. return GetContentClient()->browser()->AllowAppCache( manifest_url, first_party, resource_context_); @@ -59,7 +59,7 @@ bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url, bool ChromeAppCacheService::CanCreateAppCache( const GURL& manifest_url, const GURL& first_party) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); return GetContentClient()->browser()->AllowAppCache( manifest_url, first_party, resource_context_); } diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index d595ce1..e5434997 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -80,7 +80,7 @@ BrowserChildProcessHostImpl::BrowserChildProcessList* // static void BrowserChildProcessHostImpl::AddObserver( BrowserChildProcessObserver* observer) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); g_observers.Get().AddObserver(observer); } @@ -116,7 +116,7 @@ BrowserChildProcessHostImpl::~BrowserChildProcessHostImpl() { // static void BrowserChildProcessHostImpl::TerminateAll() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); // Make a copy since the BrowserChildProcessHost dtor mutates the original // list. BrowserChildProcessList copy = g_child_process_list.Get(); @@ -129,7 +129,7 @@ void BrowserChildProcessHostImpl::TerminateAll() { void BrowserChildProcessHostImpl::Launch( SandboxedProcessLauncherDelegate* delegate, base::CommandLine* cmd_line) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); GetContentClient()->browser()->AppendExtraCommandLineSwitches( cmd_line, data_.id); @@ -156,17 +156,17 @@ void BrowserChildProcessHostImpl::Launch( } const ChildProcessData& BrowserChildProcessHostImpl::GetData() const { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); return data_; } ChildProcessHost* BrowserChildProcessHostImpl::GetHost() const { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); return child_process_host_.get(); } const base::Process& BrowserChildProcessHostImpl::GetProcess() const { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(child_process_.get()) << "Requesting a child process handle before launching."; DCHECK(child_process_->GetProcess().IsValid()) @@ -175,17 +175,17 @@ const base::Process& BrowserChildProcessHostImpl::GetProcess() const { } void BrowserChildProcessHostImpl::SetName(const base::string16& name) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); data_.name = name; } void BrowserChildProcessHostImpl::SetHandle(base::ProcessHandle handle) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); data_.handle = handle; } void BrowserChildProcessHostImpl::ForceShutdown() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); g_child_process_list.Get().remove(this); child_process_host_->ForceShutdown(); } @@ -196,7 +196,7 @@ void BrowserChildProcessHostImpl::SetBackgrounded(bool backgrounded) { void BrowserChildProcessHostImpl::SetTerminateChildOnShutdown( bool terminate_on_shutdown) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); child_process_->SetTerminateChildOnShutdown(terminate_on_shutdown); } @@ -206,7 +206,7 @@ void BrowserChildProcessHostImpl::AddFilter(BrowserMessageFilter* filter) { void BrowserChildProcessHostImpl::NotifyProcessInstanceCreated( const ChildProcessData& data) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); FOR_EACH_OBSERVER(BrowserChildProcessObserver, g_observers.Get(), BrowserChildProcessInstanceCreated(data)); } @@ -219,7 +219,7 @@ void BrowserChildProcessHostImpl::HistogramBadMessageTerminated( base::TerminationStatus BrowserChildProcessHostImpl::GetTerminationStatus( bool known_dead, int* exit_code) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); if (!child_process_) // If the delegate doesn't use Launch() helper. return base::GetTerminationStatus(data_.handle, exit_code); return child_process_->GetChildTerminationStatus(known_dead, @@ -238,7 +238,7 @@ void BrowserChildProcessHostImpl::OnChannelConnected(int32 peer_pid) { early_exit_watcher_.StopWatching(); #endif - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(&NotifyProcessHostConnected, data_)); @@ -265,7 +265,7 @@ bool BrowserChildProcessHostImpl::CanShutdown() { } void BrowserChildProcessHostImpl::OnChildDisconnected() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); #if defined(OS_WIN) // OnChildDisconnected may be called without OnChannelConnected, so stop the // early exit watcher so GetTerminationStatus can close the process handle. diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc index 91ae727..a739483 100644 --- a/content/browser/browser_context.cc +++ b/content/browser/browser_context.cc @@ -113,7 +113,7 @@ void BrowserContext::GarbageCollectStoragePartitions( DownloadManager* BrowserContext::GetDownloadManager( BrowserContext* context) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!context->GetUserData(kDownloadManagerKeyName)) { ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); DCHECK(rdh); @@ -210,7 +210,7 @@ StoragePartition* BrowserContext::GetDefaultStoragePartition( void BrowserContext::CreateMemoryBackedBlob(BrowserContext* browser_context, const char* data, size_t length, const BlobCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); ChromeBlobStorageContext* blob_context = ChromeBlobStorageContext::GetFor(browser_context); @@ -229,7 +229,7 @@ void BrowserContext::CreateFileBackedBlob( int64_t size, const base::Time& expected_modification_time, const BlobCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); ChromeBlobStorageContext* blob_context = ChromeBlobStorageContext::GetFor(browser_context); @@ -248,7 +248,7 @@ void BrowserContext::DeliverPushMessage( int64 service_worker_registration_id, const std::string& data, const base::Callback<void(PushDeliveryStatus)>& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); PushMessagingRouter::DeliverMessage( browser_context, origin, service_worker_registration_id, data, callback); } diff --git a/content/browser/browser_ipc_logging.cc b/content/browser/browser_ipc_logging.cc index 20a56f6..7e7f05e 100644 --- a/content/browser/browser_ipc_logging.cc +++ b/content/browser/browser_ipc_logging.cc @@ -16,7 +16,7 @@ namespace content { #if defined(IPC_MESSAGE_LOG_ENABLED) void EnableIPCLoggingForChildProcesses(bool enabled) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserChildProcessHostIterator i; // default constr references a singleton while (!i.Done()) { diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 2409bc7..cbb70ac 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -352,7 +352,7 @@ class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver { // BrowserMainLoop construction / destruction ============================= BrowserMainLoop* BrowserMainLoop::GetInstance() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); return g_current_browser_main_loop; } diff --git a/content/browser/browser_plugin/browser_plugin_message_filter.cc b/content/browser/browser_plugin/browser_plugin_message_filter.cc index 438e7ef..2e2802f 100644 --- a/content/browser/browser_plugin/browser_plugin_message_filter.cc +++ b/content/browser/browser_plugin/browser_plugin_message_filter.cc @@ -24,7 +24,7 @@ BrowserPluginMessageFilter::BrowserPluginMessageFilter(int render_process_id) } BrowserPluginMessageFilter::~BrowserPluginMessageFilter() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); } bool BrowserPluginMessageFilter::OnMessageReceived( @@ -53,7 +53,7 @@ void BrowserPluginMessageFilter::OverrideThreadForMessage( void BrowserPluginMessageFilter::ForwardMessageToGuest( const IPC::Message& message) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); auto rph = RenderProcessHost::FromID(render_process_id_); if (!rph) return; diff --git a/content/browser/cocoa/system_hotkey_helper_mac.mm b/content/browser/cocoa/system_hotkey_helper_mac.mm index 68c5282..7e79572 100644 --- a/content/browser/cocoa/system_hotkey_helper_mac.mm +++ b/content/browser/cocoa/system_hotkey_helper_mac.mm @@ -45,7 +45,7 @@ SystemHotkeyHelperMac::~SystemHotkeyHelperMac() { } void SystemHotkeyHelperMac::LoadSystemHotkeys() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); std::string library_path(base::mac::GetUserLibraryPath().value()); NSString* expanded_file_path = @@ -67,7 +67,7 @@ void SystemHotkeyHelperMac::LoadSystemHotkeys() { } void SystemHotkeyHelperMac::FileDidLoad(NSDictionary* dictionary) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); bool success = map()->ParseDictionary(dictionary); UMA_HISTOGRAM_BOOLEAN("OSX.SystemHotkeyMap.LoadSuccess", success); diff --git a/content/browser/compositor/software_output_device_win.cc b/content/browser/compositor/software_output_device_win.cc index 1a6b5f6..2d6d004 100644 --- a/content/browser/compositor/software_output_device_win.cc +++ b/content/browser/compositor/software_output_device_win.cc @@ -19,19 +19,19 @@ SoftwareOutputDeviceWin::SoftwareOutputDeviceWin(ui::Compositor* compositor) : hwnd_(compositor->widget()), is_hwnd_composited_(false) { // TODO(skaslev) Remove this when crbug.com/180702 is fixed. - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); LONG style = GetWindowLong(hwnd_, GWL_EXSTYLE); is_hwnd_composited_ = !!(style & WS_EX_COMPOSITED); } SoftwareOutputDeviceWin::~SoftwareOutputDeviceWin() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); } void SoftwareOutputDeviceWin::Resize(const gfx::Size& viewport_pixel_size, float scale_factor) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); scale_factor_ = scale_factor; @@ -47,7 +47,7 @@ void SoftwareOutputDeviceWin::Resize(const gfx::Size& viewport_pixel_size, } SkCanvas* SoftwareOutputDeviceWin::BeginPaint(const gfx::Rect& damage_rect) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(contents_); damage_rect_ = damage_rect; @@ -55,7 +55,7 @@ SkCanvas* SoftwareOutputDeviceWin::BeginPaint(const gfx::Rect& damage_rect) { } void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(contents_); DCHECK(frame_data); diff --git a/content/browser/compositor/software_output_device_x11.cc b/content/browser/compositor/software_output_device_x11.cc index fb57d9c..6570c41 100644 --- a/content/browser/compositor/software_output_device_x11.cc +++ b/content/browser/compositor/software_output_device_x11.cc @@ -20,7 +20,7 @@ namespace content { SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor) : compositor_(compositor), display_(gfx::GetXDisplay()), gc_(NULL) { // TODO(skaslev) Remove this when crbug.com/180702 is fixed. - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); gc_ = XCreateGC(display_, compositor_->widget(), 0, NULL); if (!XGetWindowAttributes(display_, compositor_->widget(), &attributes_)) { @@ -31,13 +31,13 @@ SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor) } SoftwareOutputDeviceX11::~SoftwareOutputDeviceX11() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); XFreeGC(display_, gc_); } void SoftwareOutputDeviceX11::EndPaint(cc::SoftwareFrameData* frame_data) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(surface_); DCHECK(frame_data); diff --git a/content/browser/cross_site_transfer_browsertest.cc b/content/browser/cross_site_transfer_browsertest.cc index 3911545..4cc75c7 100644 --- a/content/browser/cross_site_transfer_browsertest.cc +++ b/content/browser/cross_site_transfer_browsertest.cc @@ -210,13 +210,13 @@ class CrossSiteTransferTest : public ContentBrowserTest { } void InjectResourceDisptcherHostDelegate() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); old_delegate_ = ResourceDispatcherHostImpl::Get()->delegate(); ResourceDispatcherHostImpl::Get()->SetDelegate(&tracking_delegate_); } void RestoreResourceDisptcherHostDelegate() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate_); old_delegate_ = NULL; } diff --git a/content/browser/device_monitor_mac.mm b/content/browser/device_monitor_mac.mm index 2faea0e..c3c713c 100644 --- a/content/browser/device_monitor_mac.mm +++ b/content/browser/device_monitor_mac.mm @@ -283,12 +283,12 @@ class SuspendObserverDelegate : SuspendObserverDelegate::SuspendObserverDelegate(DeviceMonitorMacImpl* monitor) : avfoundation_monitor_impl_(monitor) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); } void SuspendObserverDelegate::StartObserver( const scoped_refptr<base::SingleThreadTaskRunner>& device_thread) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); base::Closure on_device_changed_callback = base::Bind(&SuspendObserverDelegate::OnDeviceChanged, @@ -308,7 +308,7 @@ void SuspendObserverDelegate::StartObserver( void SuspendObserverDelegate::OnDeviceChanged( const scoped_refptr<base::SingleThreadTaskRunner>& device_thread) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Enumerate the devices in Device thread and post the consolidation of the // new devices and the old ones to be done on UI thread. The devices array // is retained in |device_thread| and released in DoOnDeviceChanged(). @@ -320,17 +320,17 @@ void SuspendObserverDelegate::OnDeviceChanged( } void SuspendObserverDelegate::ResetDeviceMonitor() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); avfoundation_monitor_impl_ = NULL; [suspend_observer_ clearOnDeviceChangedCallback]; } SuspendObserverDelegate::~SuspendObserverDelegate() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); } void SuspendObserverDelegate::DoStartObserver(NSArray* devices) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); base::scoped_nsobject<NSArray> auto_release(devices); for (CrAVCaptureDevice* device in devices) { base::scoped_nsobject<CrAVCaptureDevice> device_ptr([device retain]); @@ -339,7 +339,7 @@ void SuspendObserverDelegate::DoStartObserver(NSArray* devices) { } void SuspendObserverDelegate::DoOnDeviceChanged(NSArray* devices) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); base::scoped_nsobject<NSArray> auto_release(devices); std::vector<DeviceInfo> snapshot_devices; for (CrAVCaptureDevice* device in devices) { @@ -404,7 +404,7 @@ AVFoundationMonitorImpl::AVFoundationMonitorImpl( : DeviceMonitorMacImpl(monitor), device_task_runner_(device_task_runner), suspend_observer_delegate_(new SuspendObserverDelegate(this)) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; device_arrival_ = [nc addObserverForName:AVFoundationGlue:: @@ -424,7 +424,7 @@ AVFoundationMonitorImpl::AVFoundationMonitorImpl( } AVFoundationMonitorImpl::~AVFoundationMonitorImpl() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); suspend_observer_delegate_->ResetDeviceMonitor(); NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; [nc removeObserver:device_arrival_]; @@ -432,7 +432,7 @@ AVFoundationMonitorImpl::~AVFoundationMonitorImpl() { } void AVFoundationMonitorImpl::OnDeviceChanged() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); suspend_observer_delegate_->OnDeviceChanged(device_task_runner_); } @@ -441,7 +441,7 @@ void AVFoundationMonitorImpl::OnDeviceChanged() { @implementation CrAVFoundationDeviceObserver - (id)initWithOnChangedCallback:(const base::Closure&)callback { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if ((self = [super init])) { DCHECK(!callback.is_null()); onDeviceChangedCallback_ = callback; @@ -450,7 +450,7 @@ void AVFoundationMonitorImpl::OnDeviceChanged() { } - (void)dealloc { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); std::set<base::scoped_nsobject<CrAVCaptureDevice> >::iterator it = monitoredDevices_.begin(); while (it != monitoredDevices_.end()) @@ -459,7 +459,7 @@ void AVFoundationMonitorImpl::OnDeviceChanged() { } - (void)startObserving:(base::scoped_nsobject<CrAVCaptureDevice>)device { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(device != nil); // Skip this device if there are already observers connected to it. if (std::find(monitoredDevices_.begin(), monitoredDevices_.end(), device) != @@ -478,7 +478,7 @@ void AVFoundationMonitorImpl::OnDeviceChanged() { } - (void)stopObserving:(CrAVCaptureDevice*)device { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(device != nil); std::set<base::scoped_nsobject<CrAVCaptureDevice> >::iterator found = @@ -489,12 +489,12 @@ void AVFoundationMonitorImpl::OnDeviceChanged() { } - (void)clearOnDeviceChangedCallback { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); onDeviceChangedCallback_.Reset(); } - (void)removeObservers:(CrAVCaptureDevice*)device { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Check sanity of |device| via its -observationInfo. http://crbug.com/371271. if ([device observationInfo]) { [device removeObserver:self @@ -508,7 +508,7 @@ void AVFoundationMonitorImpl::OnDeviceChanged() { ofObject:(id)object change:(NSDictionary*)change context:(void*)context { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if ([keyPath isEqual:@"suspended"]) onDeviceChangedCallback_.Run(); if ([keyPath isEqual:@"connected"]) diff --git a/content/browser/device_monitor_udev.cc b/content/browser/device_monitor_udev.cc index 6e2b4ec..82529e1 100644 --- a/content/browser/device_monitor_udev.cc +++ b/content/browser/device_monitor_udev.cc @@ -45,7 +45,7 @@ DeviceMonitorLinux::~DeviceMonitorLinux() { } void DeviceMonitorLinux::Initialize() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); // We want to be notified of IO message loop destruction to delete |udev_|. base::MessageLoop::current()->AddDestructionObserver(this); @@ -66,7 +66,7 @@ void DeviceMonitorLinux::WillDestroyCurrentMessageLoop() { } void DeviceMonitorLinux::OnDevicesChanged(udev_device* device) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(device); base::SystemMonitor::DeviceType device_type = diff --git a/content/browser/device_sensors/device_light_message_filter.cc b/content/browser/device_sensors/device_light_message_filter.cc index 751b6f1..797b3ea 100644 --- a/content/browser/device_sensors/device_light_message_filter.cc +++ b/content/browser/device_sensors/device_light_message_filter.cc @@ -14,7 +14,7 @@ DeviceLightMessageFilter::DeviceLightMessageFilter() } DeviceLightMessageFilter::~DeviceLightMessageFilter() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); if (is_started_) { DeviceInertialSensorService::GetInstance()->RemoveConsumer( CONSUMER_TYPE_LIGHT); diff --git a/content/browser/device_sensors/device_motion_message_filter.cc b/content/browser/device_sensors/device_motion_message_filter.cc index 2994c38..f874ea4 100644 --- a/content/browser/device_sensors/device_motion_message_filter.cc +++ b/content/browser/device_sensors/device_motion_message_filter.cc @@ -15,7 +15,7 @@ DeviceMotionMessageFilter::DeviceMotionMessageFilter() } DeviceMotionMessageFilter::~DeviceMotionMessageFilter() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); if (is_started_) DeviceInertialSensorService::GetInstance()->RemoveConsumer( CONSUMER_TYPE_MOTION); diff --git a/content/browser/device_sensors/device_orientation_message_filter.cc b/content/browser/device_sensors/device_orientation_message_filter.cc index 402aa67..63a9d62 100644 --- a/content/browser/device_sensors/device_orientation_message_filter.cc +++ b/content/browser/device_sensors/device_orientation_message_filter.cc @@ -15,7 +15,7 @@ DeviceOrientationMessageFilter::DeviceOrientationMessageFilter() } DeviceOrientationMessageFilter::~DeviceOrientationMessageFilter() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); if (is_started_) DeviceInertialSensorService::GetInstance()->RemoveConsumer( CONSUMER_TYPE_ORIENTATION); diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc index 213ae97..2c55fad 100644 --- a/content/browser/devtools/devtools_agent_host_impl.cc +++ b/content/browser/devtools/devtools_agent_host_impl.cc @@ -67,12 +67,12 @@ scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker( DevToolsAgentHostImpl::DevToolsAgentHostImpl() : id_(base::GenerateGUID()), client_(NULL) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); g_instances.Get()[id_] = this; } DevToolsAgentHostImpl::~DevToolsAgentHostImpl() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); g_instances.Get().erase(g_instances.Get().find(id_)); } diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index b4cedce..fb25825d 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -253,7 +253,7 @@ void ServerWrapper::Close(int connection_id) { void TerminateOnUI(base::Thread* thread, ServerWrapper* server_wrapper, DevToolsHttpHandler::ServerSocketFactory* socket_factory) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (server_wrapper) { DCHECK(thread); thread->message_loop()->DeleteSoon(FROM_HERE, server_wrapper); @@ -273,7 +273,7 @@ void ServerStartedOnUI( ServerWrapper* server_wrapper, DevToolsHttpHandler::ServerSocketFactory* socket_factory, scoped_ptr<net::IPEndPoint> ip_address) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (handler && thread && server_wrapper) { handler->ServerStarted(thread, server_wrapper, socket_factory, ip_address.Pass()); @@ -321,7 +321,7 @@ void StartServerOnFile( const base::FilePath& output_directory, const base::FilePath& frontend_dir, bool bundles_resources) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); scoped_ptr<base::Thread> thread(new base::Thread(kDevToolsHandlerThreadName)); base::Thread::Options options; options.message_loop_type = base::MessageLoop::TYPE_IO; @@ -432,7 +432,7 @@ class BrowserTarget { } void HandleMessage(const std::string& message) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); std::string error_response; scoped_ptr<base::DictionaryValue> command = protocol_handler_->ParseCommand(message); @@ -441,7 +441,7 @@ class BrowserTarget { } void Respond(const std::string& message) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); message_loop_->PostTask( FROM_HERE, base::Bind(&ServerWrapper::SendOverWebSocket, diff --git a/content/browser/devtools/devtools_netlog_observer.cc b/content/browser/devtools/devtools_netlog_observer.cc index 2e84952..4406aea 100644 --- a/content/browser/devtools/devtools_netlog_observer.cc +++ b/content/browser/devtools/devtools_netlog_observer.cc @@ -46,7 +46,7 @@ void DevToolsNetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { void DevToolsNetLogObserver::OnAddURLRequestEntry( const net::NetLog::Entry& entry) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); bool is_begin = entry.phase() == net::NetLog::PHASE_BEGIN; bool is_end = entry.phase() == net::NetLog::PHASE_END; @@ -174,7 +174,7 @@ void DevToolsNetLogObserver::Attach() { } void DevToolsNetLogObserver::Detach() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); if (instance_) { // Safest not to do this in the destructor to maintain thread safety across @@ -186,7 +186,7 @@ void DevToolsNetLogObserver::Detach() { } DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); return instance_; } diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc index 2da7b3c..b28c836 100644 --- a/content/browser/devtools/protocol/service_worker_handler.cc +++ b/content/browser/devtools/protocol/service_worker_handler.cc @@ -142,11 +142,11 @@ ServiceWorkerHandler::ContextObserver::ContextObserver( scoped_refptr<ServiceWorkerContextWrapper> context, base::WeakPtr<ServiceWorkerHandler> handler) : context_(context), handler_(handler) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); } void ServiceWorkerHandler::ContextObserver::Start() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&ServiceWorkerHandler::ContextObserver:: GetStoredRegistrationsOnIOThread, @@ -154,14 +154,14 @@ void ServiceWorkerHandler::ContextObserver::Start() { } void ServiceWorkerHandler::ContextObserver::Stop() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&ServiceWorkerHandler::ContextObserver::StopOnIOThread, this)); } void ServiceWorkerHandler::ContextObserver::GetStoredRegistrationsOnIOThread() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); context_->context()->storage()->GetAllRegistrations(base::Bind( &ServiceWorkerHandler::ContextObserver::OnStoredRegistrationsOnIOThread, this)); @@ -169,7 +169,7 @@ void ServiceWorkerHandler::ContextObserver::GetStoredRegistrationsOnIOThread() { void ServiceWorkerHandler::ContextObserver::OnStoredRegistrationsOnIOThread( const std::vector<ServiceWorkerRegistrationInfo>& registrations) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); context_->AddObserver(this); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -186,7 +186,7 @@ void ServiceWorkerHandler::ContextObserver::OnStoredRegistrationsOnIOThread( } void ServiceWorkerHandler::ContextObserver::StopOnIOThread() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); context_->RemoveObserver(this); } @@ -194,7 +194,7 @@ ServiceWorkerHandler::ContextObserver::~ContextObserver() { } void ServiceWorkerHandler::ContextObserver::OnVersionUpdated(int64 version_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); content::ServiceWorkerVersion* version = context_->context()->GetLiveVersion(version_id); if (!version) @@ -235,7 +235,7 @@ void ServiceWorkerHandler::ContextObserver::OnVersionStateChanged( void ServiceWorkerHandler::ContextObserver::OnRegistrationStored( int64 registration_id, const GURL& pattern) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); content::ServiceWorkerRegistration* registration = context_->context()->GetLiveRegistration(registration_id); DCHECK(registration); @@ -250,7 +250,7 @@ void ServiceWorkerHandler::ContextObserver::OnRegistrationStored( void ServiceWorkerHandler::ContextObserver::OnRegistrationDeleted( int64 registration_id, const GURL& pattern) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&ServiceWorkerHandler::OnWorkerRegistrationDeleted, handler_, diff --git a/content/browser/devtools/service_worker_devtools_manager.cc b/content/browser/devtools/service_worker_devtools_manager.cc index 2b5117c..116cdbc 100644 --- a/content/browser/devtools/service_worker_devtools_manager.cc +++ b/content/browser/devtools/service_worker_devtools_manager.cc @@ -44,7 +44,7 @@ bool ServiceWorkerDevToolsManager::ServiceWorkerIdentifier::Matches( // static ServiceWorkerDevToolsManager* ServiceWorkerDevToolsManager::GetInstance() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); return Singleton<ServiceWorkerDevToolsManager>::get(); } @@ -69,7 +69,7 @@ bool ServiceWorkerDevToolsManager::WorkerCreated( int worker_process_id, int worker_route_id, const ServiceWorkerIdentifier& service_worker_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId id(worker_process_id, worker_route_id); AgentHostMap::iterator it = FindExistingWorkerAgentHost(service_worker_id); if (it == workers_.end()) { @@ -97,7 +97,7 @@ bool ServiceWorkerDevToolsManager::WorkerCreated( void ServiceWorkerDevToolsManager::WorkerReadyForInspection( int worker_process_id, int worker_route_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId id(worker_process_id, worker_route_id); AgentHostMap::iterator it = workers_.find(id); DCHECK(it != workers_.end()); @@ -115,14 +115,14 @@ void ServiceWorkerDevToolsManager::WorkerReadyForInspection( void ServiceWorkerDevToolsManager::WorkerStopIgnored(int worker_process_id, int worker_route_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // TODO(pfeldman): Show a console message to tell the user that UA didn't // terminate the worker because devtools is attached. } void ServiceWorkerDevToolsManager::WorkerDestroyed(int worker_process_id, int worker_route_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId id(worker_process_id, worker_route_id); AgentHostMap::iterator it = workers_.find(id); DCHECK(it != workers_.end()); @@ -133,7 +133,7 @@ void ServiceWorkerDevToolsManager::WorkerDestroyed(int worker_process_id, } void ServiceWorkerDevToolsManager::RemoveInspectedWorkerData(WorkerId id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); workers_.erase(id); } diff --git a/content/browser/devtools/shared_worker_devtools_manager.cc b/content/browser/devtools/shared_worker_devtools_manager.cc index 9b83f51..3fb2cf1 100644 --- a/content/browser/devtools/shared_worker_devtools_manager.cc +++ b/content/browser/devtools/shared_worker_devtools_manager.cc @@ -13,7 +13,7 @@ namespace content { // static SharedWorkerDevToolsManager* SharedWorkerDevToolsManager::GetInstance() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); return Singleton<SharedWorkerDevToolsManager>::get(); } @@ -38,7 +38,7 @@ bool SharedWorkerDevToolsManager::WorkerCreated( int worker_process_id, int worker_route_id, const SharedWorkerInstance& instance) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId id(worker_process_id, worker_route_id); AgentHostMap::iterator it = FindExistingWorkerAgentHost(instance); @@ -60,7 +60,7 @@ bool SharedWorkerDevToolsManager::WorkerCreated( void SharedWorkerDevToolsManager::WorkerReadyForInspection( int worker_process_id, int worker_route_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId id(worker_process_id, worker_route_id); AgentHostMap::iterator it = workers_.find(id); DCHECK(it != workers_.end()); @@ -70,7 +70,7 @@ void SharedWorkerDevToolsManager::WorkerReadyForInspection( void SharedWorkerDevToolsManager::WorkerDestroyed( int worker_process_id, int worker_route_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId id(worker_process_id, worker_route_id); AgentHostMap::iterator it = workers_.find(id); DCHECK(it != workers_.end()); @@ -80,7 +80,7 @@ void SharedWorkerDevToolsManager::WorkerDestroyed( } void SharedWorkerDevToolsManager::RemoveInspectedWorkerData(WorkerId id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); workers_.erase(id); } SharedWorkerDevToolsManager::SharedWorkerDevToolsManager() { diff --git a/content/browser/devtools/worker_devtools_agent_host.cc b/content/browser/devtools/worker_devtools_agent_host.cc index 15fadb2..204435a 100644 --- a/content/browser/devtools/worker_devtools_agent_host.cc +++ b/content/browser/devtools/worker_devtools_agent_host.cc @@ -55,7 +55,7 @@ void WorkerDevToolsAgentHost::OnClientDetached() { bool WorkerDevToolsAgentHost::OnMessageReceived( const IPC::Message& msg) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); bool handled = true; IPC_BEGIN_MESSAGE_MAP(WorkerDevToolsAgentHost, msg) IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend, diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc index 5bca783..62ffe57 100644 --- a/content/browser/download/base_file.cc +++ b/content/browser/download/base_file.cc @@ -55,7 +55,7 @@ BaseFile::BaseFile(const base::FilePath& full_path, } BaseFile::~BaseFile() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (detached_) Close(); else @@ -64,7 +64,7 @@ BaseFile::~BaseFile() { DownloadInterruptReason BaseFile::Initialize( const base::FilePath& default_directory) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); if (full_path_.empty()) { @@ -90,7 +90,7 @@ DownloadInterruptReason BaseFile::Initialize( DownloadInterruptReason BaseFile::AppendDataToFile(const char* data, size_t data_len) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); // NOTE(benwells): The above DCHECK won't be present in release builds, @@ -137,7 +137,7 @@ DownloadInterruptReason BaseFile::AppendDataToFile(const char* data, } DownloadInterruptReason BaseFile::Rename(const base::FilePath& new_path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DownloadInterruptReason rename_result = DOWNLOAD_INTERRUPT_REASON_NONE; // If the new path is same as the old one, there is no need to perform the @@ -179,7 +179,7 @@ void BaseFile::Detach() { } void BaseFile::Cancel() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); bound_net_log_.AddEvent(net::NetLog::TYPE_CANCELLED); @@ -195,7 +195,7 @@ void BaseFile::Cancel() { } void BaseFile::Finish() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (calculate_hash_) secure_hash_->Finish(sha256_hash_, crypto::kSHA256Length); @@ -251,7 +251,7 @@ std::string BaseFile::DebugString() const { } DownloadInterruptReason BaseFile::Open() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); DCHECK(!full_path_.empty()); @@ -297,7 +297,7 @@ DownloadInterruptReason BaseFile::Open() { } void BaseFile::Close() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_CLOSED); diff --git a/content/browser/download/base_file_linux.cc b/content/browser/download/base_file_linux.cc index ee8d1fa..721cd60 100644 --- a/content/browser/download/base_file_linux.cc +++ b/content/browser/download/base_file_linux.cc @@ -10,7 +10,7 @@ namespace content { DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); AddOriginMetadataToFile(full_path_, source_url_, referrer_url_); diff --git a/content/browser/download/base_file_mac.cc b/content/browser/download/base_file_mac.cc index 21e6b55..f3edf12 100644 --- a/content/browser/download/base_file_mac.cc +++ b/content/browser/download/base_file_mac.cc @@ -10,7 +10,7 @@ namespace content { DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); AddQuarantineMetadataToFile(full_path_, source_url_, referrer_url_); diff --git a/content/browser/download/base_file_win.cc b/content/browser/download/base_file_win.cc index fec1454..6e836c7 100644 --- a/content/browser/download/base_file_win.cc +++ b/content/browser/download/base_file_win.cc @@ -353,7 +353,7 @@ DownloadInterruptReason BaseFile::MoveFileAndAdjustPermissions( } DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!detached_); bound_net_log_.BeginEvent(net::NetLog::TYPE_DOWNLOAD_FILE_ANNOTATED); diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index a129f23..f0ffbe3 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -201,7 +201,7 @@ DownloadFileWithDelay::~DownloadFileWithDelay() {} void DownloadFileWithDelay::RenameAndUniquify( const base::FilePath& full_path, const RenameCompletionCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DownloadFileImpl::RenameAndUniquify( full_path, base::Bind(DownloadFileWithDelay::RenameCallbackWrapper, owner_, callback)); @@ -209,7 +209,7 @@ void DownloadFileWithDelay::RenameAndUniquify( void DownloadFileWithDelay::RenameAndAnnotate( const base::FilePath& full_path, const RenameCompletionCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DownloadFileImpl::RenameAndAnnotate( full_path, base::Bind(DownloadFileWithDelay::RenameCallbackWrapper, owner_, callback)); @@ -221,7 +221,7 @@ void DownloadFileWithDelay::RenameCallbackWrapper( const RenameCompletionCallback& original_callback, DownloadInterruptReason reason, const base::FilePath& path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!factory) return; factory->AddRenameCallback(base::Bind(original_callback, reason, path)); @@ -252,7 +252,7 @@ DownloadFile* DownloadFileWithDelayFactory::CreateFile( } void DownloadFileWithDelayFactory::AddRenameCallback(base::Closure callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); rename_callbacks_.push_back(callback); if (waiting_) base::MessageLoopForUI::current()->Quit(); @@ -260,12 +260,12 @@ void DownloadFileWithDelayFactory::AddRenameCallback(base::Closure callback) { void DownloadFileWithDelayFactory::GetAllRenameCallbacks( std::vector<base::Closure>* results) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); results->swap(rename_callbacks_); } void DownloadFileWithDelayFactory::WaitForSomeCallback() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (rename_callbacks_.empty()) { waiting_ = true; @@ -291,18 +291,18 @@ class CountingDownloadFile : public DownloadFileImpl { stream.Pass(), bound_net_log, observer) {} ~CountingDownloadFile() override { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); active_files_--; } void Initialize(const InitializeCallback& callback) override { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); active_files_++; return DownloadFileImpl::Initialize(callback); } static void GetNumberActiveFiles(int* result) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); *result = active_files_; } @@ -470,7 +470,7 @@ class DownloadCreateObserver : DownloadManager::Observer { } DownloadItem* WaitForFinished() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!item_) { waiting_ = true; RunMessageLoop(); diff --git a/content/browser/download/download_file_impl.cc b/content/browser/download/download_file_impl.cc index 91b25da..203c689 100644 --- a/content/browser/download/download_file_impl.cc +++ b/content/browser/download/download_file_impl.cc @@ -59,12 +59,12 @@ DownloadFileImpl::DownloadFileImpl( } DownloadFileImpl::~DownloadFileImpl() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); --number_active_objects_; } void DownloadFileImpl::Initialize(const InitializeCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); update_timer_.reset(new base::RepeatingTimer<DownloadFileImpl>()); DownloadInterruptReason result = @@ -95,7 +95,7 @@ void DownloadFileImpl::Initialize(const InitializeCallback& callback) { DownloadInterruptReason DownloadFileImpl::AppendDataToFile( const char* data, size_t data_len) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (!update_timer_->IsRunning()) { update_timer_->Start(FROM_HERE, @@ -144,7 +144,7 @@ void DownloadFileImpl::RenameWithRetryInternal( int retries_left, base::TimeTicks time_of_first_failure, const RenameCompletionCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); base::FilePath new_path(full_path); diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc index 753656f..a0dea56 100644 --- a/content/browser/download/download_item_impl.cc +++ b/content/browser/download/download_item_impl.cc @@ -58,7 +58,7 @@ namespace content { namespace { bool DeleteDownloadedFile(const base::FilePath& path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); // Make sure we only delete files. if (base::DirectoryExists(path)) @@ -70,7 +70,7 @@ void DeleteDownloadedFileDone( base::WeakPtr<DownloadItemImpl> item, const base::Callback<void(bool)>& callback, bool success) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (success && item.get()) item->OnDownloadedFileRemoved(); callback.Run(success); @@ -81,14 +81,14 @@ void DeleteDownloadedFileDone( // at the end of the function. static base::FilePath DownloadFileDetach( scoped_ptr<DownloadFile> download_file) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); base::FilePath full_path = download_file->FullPath(); download_file->Detach(); return full_path; } static void DownloadFileCancel(scoped_ptr<DownloadFile> download_file) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); download_file->Cancel(); } @@ -272,7 +272,7 @@ DownloadItemImpl::DownloadItemImpl( } DownloadItemImpl::~DownloadItemImpl() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Should always have been nuked before now, at worst in // DownloadManager shutdown. @@ -284,25 +284,25 @@ DownloadItemImpl::~DownloadItemImpl() { } void DownloadItemImpl::AddObserver(Observer* observer) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); observers_.AddObserver(observer); } void DownloadItemImpl::RemoveObserver(Observer* observer) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); observers_.RemoveObserver(observer); } void DownloadItemImpl::UpdateObservers() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); FOR_EACH_OBSERVER(Observer, observers_, OnDownloadUpdated(this)); } void DownloadItemImpl::ValidateDangerousDownload() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!IsDone()); DCHECK(IsDangerous()); @@ -328,7 +328,7 @@ void DownloadItemImpl::ValidateDangerousDownload() { void DownloadItemImpl::StealDangerousDownload( const AcquireFileCallback& callback) { DVLOG(20) << __FUNCTION__ << "() download = " << DebugString(true); - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(IsDangerous()); if (download_file_) { BrowserThread::PostTaskAndReplyWithResult( @@ -345,7 +345,7 @@ void DownloadItemImpl::StealDangerousDownload( } void DownloadItemImpl::Pause() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Ignore irrelevant states. if (state_ != IN_PROGRESS_INTERNAL || is_paused_) @@ -357,7 +357,7 @@ void DownloadItemImpl::Pause() { } void DownloadItemImpl::Resume() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); switch (state_) { case IN_PROGRESS_INTERNAL: if (!is_paused_) @@ -384,7 +384,7 @@ void DownloadItemImpl::Resume() { } void DownloadItemImpl::Cancel(bool user_cancel) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DVLOG(20) << __FUNCTION__ << "() download = " << DebugString(true); if (state_ != IN_PROGRESS_INTERNAL && @@ -435,7 +435,7 @@ void DownloadItemImpl::Cancel(bool user_cancel) { void DownloadItemImpl::Remove() { DVLOG(20) << __FUNCTION__ << "() download = " << DebugString(true); - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); delegate_->AssertStateConsistent(this); Cancel(true); @@ -447,7 +447,7 @@ void DownloadItemImpl::Remove() { } void DownloadItemImpl::OpenDownload() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!IsDone()) { // We don't honor the open_when_complete_ flag for temporary @@ -472,7 +472,7 @@ void DownloadItemImpl::OpenDownload() { } void DownloadItemImpl::ShowDownloadInShell() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); delegate_->ShowDownloadInShell(this); } @@ -641,7 +641,7 @@ bool DownloadItemImpl::GetFileExternallyRemoved() const { } void DownloadItemImpl::DeleteFile(const base::Callback<void(bool)>& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (GetState() != DownloadItem::COMPLETE) { // Pass a null WeakPtr so it doesn't call OnDownloadedFileRemoved. BrowserThread::PostTask( @@ -779,7 +779,7 @@ WebContents* DownloadItemImpl::GetWebContents() const { } void DownloadItemImpl::OnContentCheckCompleted(DownloadDangerType danger_type) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(AllDataSaved()); DVLOG(20) << __FUNCTION__ << " danger_type=" << danger_type << " download=" << DebugString(true); @@ -864,7 +864,7 @@ std::string DownloadItemImpl::DebugString(bool verbose) const { } DownloadItemImpl::ResumeMode DownloadItemImpl::GetResumeMode() const { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // We can't continue without a handle on the intermediate file. // We also can't continue if we don't have some verifier to make sure // we're getting the same file. @@ -938,7 +938,7 @@ DownloadItemImpl::ResumeMode DownloadItemImpl::GetResumeMode() const { void DownloadItemImpl::MergeOriginInfoOnResume( const DownloadCreateInfo& new_create_info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(RESUMING_INTERNAL, state_); DCHECK(!new_create_info.url_chain.empty()); @@ -1004,7 +1004,7 @@ void DownloadItemImpl::SetTotalBytes(int64 total_bytes) { } void DownloadItemImpl::OnAllDataSaved(const std::string& final_hash) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(IN_PROGRESS_INTERNAL, state_); DCHECK(!all_data_saved_); @@ -1019,7 +1019,7 @@ void DownloadItemImpl::OnAllDataSaved(const std::string& final_hash) { } void DownloadItemImpl::MarkAsComplete() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(all_data_saved_); end_time_ = base::Time::Now(); @@ -1029,7 +1029,7 @@ void DownloadItemImpl::MarkAsComplete() { void DownloadItemImpl::DestinationUpdate(int64 bytes_so_far, int64 bytes_per_sec, const std::string& hash_state) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DVLOG(20) << __FUNCTION__ << " so_far=" << bytes_so_far << " per_sec=" << bytes_per_sec << " download=" << DebugString(true); @@ -1086,7 +1086,7 @@ void DownloadItemImpl::DestinationCompleted(const std::string& final_hash) { void DownloadItemImpl::Init(bool active, DownloadType download_type) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (active) RecordDownloadCount(START_COUNT); @@ -1123,7 +1123,7 @@ void DownloadItemImpl::Init(bool active, void DownloadItemImpl::Start( scoped_ptr<DownloadFile> file, scoped_ptr<DownloadRequestHandleInterface> req_handle) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!download_file_.get()); DCHECK(file.get()); DCHECK(req_handle.get()); @@ -1152,7 +1152,7 @@ void DownloadItemImpl::Start( void DownloadItemImpl::OnDownloadFileInitialized( DownloadInterruptReason result) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (result != DOWNLOAD_INTERRUPT_REASON_NONE) { Interrupt(result); // TODO(rdsmith/asanka): Arguably we should show this in the UI, but @@ -1178,7 +1178,7 @@ void DownloadItemImpl::OnDownloadTargetDetermined( TargetDisposition disposition, DownloadDangerType danger_type, const base::FilePath& intermediate_path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // If the |target_path| is empty, then we consider this download to be // canceled. @@ -1241,7 +1241,7 @@ void DownloadItemImpl::OnDownloadTargetDetermined( void DownloadItemImpl::OnDownloadRenamedToIntermediateName( DownloadInterruptReason reason, const base::FilePath& full_path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DVLOG(20) << __FUNCTION__ << " download=" << DebugString(true); if (DOWNLOAD_INTERRUPT_REASON_NONE != destination_error_) { @@ -1275,7 +1275,7 @@ void DownloadItemImpl::OnDownloadRenamedToIntermediateName( // downloads. SavePackage always uses its own Finish() to mark downloads // complete. void DownloadItemImpl::MaybeCompleteDownload() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!is_save_package_download_); if (!IsDownloadReadyForCompletion( @@ -1299,7 +1299,7 @@ void DownloadItemImpl::MaybeCompleteDownload() { // Called by MaybeCompleteDownload() when it has determined that the download // is ready for completion. void DownloadItemImpl::OnDownloadCompleting() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (state_ != IN_PROGRESS_INTERNAL) return; @@ -1336,7 +1336,7 @@ void DownloadItemImpl::OnDownloadCompleting() { void DownloadItemImpl::OnDownloadRenamedToFinalName( DownloadInterruptReason reason, const base::FilePath& full_path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!is_save_package_download_); // If a cancel or interrupt hit, we'll cancel the DownloadFile, which @@ -1387,14 +1387,14 @@ void DownloadItemImpl::OnDownloadRenamedToFinalName( } void DownloadItemImpl::DelayedDownloadOpened(bool auto_opened) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); auto_opened_ = auto_opened; Completed(); } void DownloadItemImpl::Completed() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DVLOG(20) << __FUNCTION__ << "() " << DebugString(false); @@ -1439,7 +1439,7 @@ void DownloadItemImpl::OnResumeRequestStarted( // An error occurred somewhere. void DownloadItemImpl::Interrupt(DownloadInterruptReason reason) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_NE(DOWNLOAD_INTERRUPT_REASON_NONE, reason); // Somewhat counter-intuitively, it is possible for us to receive an @@ -1499,7 +1499,7 @@ void DownloadItemImpl::Interrupt(DownloadInterruptReason reason) { } void DownloadItemImpl::ReleaseDownloadFile(bool destroy_file) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (destroy_file) { BrowserThread::PostTask( @@ -1560,7 +1560,7 @@ bool DownloadItemImpl::IsDownloadReadyForCompletion( void DownloadItemImpl::TransitionTo(DownloadInternalState new_state, ShouldUpdateObservers notify_action) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (state_ == new_state) return; @@ -1650,7 +1650,7 @@ void DownloadItemImpl::SetDangerType(DownloadDangerType danger_type) { } void DownloadItemImpl::SetFullPath(const base::FilePath& new_path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DVLOG(20) << __FUNCTION__ << "()" << " new_path = \"" << new_path.value() << "\"" << " " << DebugString(true); @@ -1665,7 +1665,7 @@ void DownloadItemImpl::SetFullPath(const base::FilePath& new_path) { void DownloadItemImpl::AutoResumeIfValid() { DVLOG(20) << __FUNCTION__ << "() " << DebugString(true); - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); ResumeMode mode = GetResumeMode(); if (mode != RESUME_MODE_IMMEDIATE_RESTART && @@ -1679,7 +1679,7 @@ void DownloadItemImpl::AutoResumeIfValid() { } void DownloadItemImpl::ResumeInterruptedDownload() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // If the flag for downloads resumption isn't enabled, ignore // this request. diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index f058c25..bdb820b 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -50,7 +50,7 @@ namespace { void BeginDownload(scoped_ptr<DownloadUrlParameters> params, uint32 download_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); // ResourceDispatcherHost{Base} is-not-a URLRequest::Delegate, and // DownloadUrlParameters can-not include resource_dispatcher_host_impl.h, so // we must down cast. RDHI is the only subclass of RDH as of 2012 May 4. @@ -249,7 +249,7 @@ DownloadManagerImpl::~DownloadManagerImpl() { DownloadItemImpl* DownloadManagerImpl::CreateActiveItem( uint32 id, const DownloadCreateInfo& info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!ContainsKey(downloads_, id)); net::BoundNetLog bound_net_log = net::BoundNetLog::Make(net_log_, net::NetLog::SOURCE_DOWNLOAD); @@ -260,7 +260,7 @@ DownloadItemImpl* DownloadManagerImpl::CreateActiveItem( } void DownloadManagerImpl::GetNextId(const DownloadIdCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (delegate_) { delegate_->GetNextId(callback); return; @@ -358,7 +358,7 @@ void DownloadManagerImpl::StartDownload( scoped_ptr<DownloadCreateInfo> info, scoped_ptr<ByteStreamReader> stream, const DownloadUrlParameters::OnStartedCallback& on_started) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(info); uint32 download_id = info->download_id; const bool new_download = (download_id == content::DownloadItem::kInvalidId); @@ -382,7 +382,7 @@ void DownloadManagerImpl::StartDownloadWithId( const DownloadUrlParameters::OnStartedCallback& on_started, bool new_download, uint32 id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_NE(content::DownloadItem::kInvalidId, id); DownloadItemImpl* download = NULL; if (new_download) { @@ -445,7 +445,7 @@ void DownloadManagerImpl::StartDownloadWithId( } void DownloadManagerImpl::CheckForHistoryFilesRemoval() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); for (DownloadMap::iterator it = downloads_.begin(); it != downloads_.end(); ++it) { DownloadItemImpl* item = it->second; @@ -454,7 +454,7 @@ void DownloadManagerImpl::CheckForHistoryFilesRemoval() { } void DownloadManagerImpl::CheckForFileRemoval(DownloadItemImpl* download_item) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if ((download_item->GetState() == DownloadItem::COMPLETE) && !download_item->GetFileExternallyRemoved() && delegate_) { @@ -467,7 +467,7 @@ void DownloadManagerImpl::CheckForFileRemoval(DownloadItemImpl* download_item) { void DownloadManagerImpl::OnFileExistenceChecked(uint32 download_id, bool result) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!result) { // File does not exist. if (ContainsKey(downloads_, download_id)) downloads_[download_id]->OnDownloadedFileRemoved(); @@ -484,7 +484,7 @@ void DownloadManagerImpl::CreateSavePackageDownloadItem( const std::string& mime_type, scoped_ptr<DownloadRequestHandleInterface> request_handle, const DownloadItemImplCreated& item_created) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); GetNextId(base::Bind( &DownloadManagerImpl::CreateSavePackageDownloadItemWithId, weak_factory_.GetWeakPtr(), @@ -502,7 +502,7 @@ void DownloadManagerImpl::CreateSavePackageDownloadItemWithId( scoped_ptr<DownloadRequestHandleInterface> request_handle, const DownloadItemImplCreated& item_created, uint32 id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_NE(content::DownloadItem::kInvalidId, id); DCHECK(!ContainsKey(downloads_, id)); net::BoundNetLog bound_net_log = diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc index 224f45c..09de2e6 100644 --- a/content/browser/download/download_resource_handler.cc +++ b/content/browser/download/download_resource_handler.cc @@ -46,7 +46,7 @@ void CallStartedCBOnUIThread( const DownloadUrlParameters::OnStartedCallback& started_cb, DownloadItem* item, DownloadInterruptReason interrupt_reason) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (started_cb.is_null()) return; @@ -60,7 +60,7 @@ static void StartOnUIThread( DownloadResourceHandler::DownloadTabInfo* tab_info, scoped_ptr<ByteStreamReader> stream, const DownloadUrlParameters::OnStartedCallback& started_cb) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DownloadManager* download_manager = info->request_handle.GetDownloadManager(); if (!download_manager) { @@ -84,7 +84,7 @@ static void StartOnUIThread( void InitializeDownloadTabInfoOnUIThread( const DownloadRequestHandle& request_handle, DownloadResourceHandler::DownloadTabInfo* tab_info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); WebContents* web_contents = request_handle.GetWebContents(); if (web_contents) { @@ -150,7 +150,7 @@ bool DownloadResourceHandler::OnRequestRedirected( bool DownloadResourceHandler::OnResponseStarted( ResourceResponse* response, bool* defer) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); // There can be only one (call) DCHECK(!on_response_started_called_); on_response_started_called_ = true; @@ -260,7 +260,7 @@ bool DownloadResourceHandler::OnResponseStarted( void DownloadResourceHandler::CallStartedCB( DownloadItem* item, DownloadInterruptReason interrupt_reason) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); if (started_cb_.is_null()) return; BrowserThread::PostTask( @@ -285,7 +285,7 @@ bool DownloadResourceHandler::OnBeforeNetworkStart(const GURL& url, bool DownloadResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, int* buf_size, int min_size) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(buf && buf_size); DCHECK(!read_buffer_.get()); @@ -298,7 +298,7 @@ bool DownloadResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, // Pass the buffer to the download file writer. bool DownloadResourceHandler::OnReadCompleted(int bytes_read, bool* defer) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(read_buffer_.get()); base::TimeTicks now(base::TimeTicks::Now()); @@ -340,7 +340,7 @@ void DownloadResourceHandler::OnResponseCompleted( const net::URLRequestStatus& status, const std::string& security_info, bool* defer) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); int response_code = status.is_success() ? request()->GetResponseCode() : 0; DVLOG(20) << __FUNCTION__ << "()" << DebugString() << " status.status() = " << status.status() @@ -463,13 +463,13 @@ void DownloadResourceHandler::OnDataDownloaded(int bytes_downloaded) { } void DownloadResourceHandler::PauseRequest() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); ++pause_count_; } void DownloadResourceHandler::ResumeRequest() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_LT(0, pause_count_); --pause_count_; @@ -489,7 +489,7 @@ void DownloadResourceHandler::ResumeRequest() { } void DownloadResourceHandler::CancelRequest() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); const ResourceRequestInfo* info = GetRequestInfo(); ResourceDispatcherHostImpl::Get()->CancelRequest( @@ -517,7 +517,7 @@ std::string DownloadResourceHandler::DebugString() const { } DownloadResourceHandler::~DownloadResourceHandler() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); // This won't do anything if the callback was called before. // If it goes through, it will likely be because OnWillStart() returned diff --git a/content/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc index ca68740..13950a1 100644 --- a/content/browser/download/drag_download_file.cc +++ b/content/browser/download/drag_download_file.cc @@ -55,7 +55,7 @@ class DragDownloadFile::DragDownloadFileUI : public DownloadItem::Observer { void InitiateDownload(base::File file, const base::FilePath& file_path) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DownloadManager* download_manager = BrowserContext::GetDownloadManager(web_contents_->GetBrowserContext()); @@ -72,26 +72,26 @@ class DragDownloadFile::DragDownloadFileUI : public DownloadItem::Observer { } void Cancel() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (download_item_) download_item_->Cancel(true); } void Delete() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); delete this; } private: ~DragDownloadFileUI() override { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (download_item_) download_item_->RemoveObserver(this); } void OnDownloadStarted(DownloadItem* item, DownloadInterruptReason interrupt_reason) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!item) { DCHECK_NE(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason); on_completed_loop_->PostTask(FROM_HERE, base::Bind(on_completed_, false)); @@ -104,7 +104,7 @@ class DragDownloadFile::DragDownloadFileUI : public DownloadItem::Observer { // DownloadItem::Observer: void OnDownloadUpdated(DownloadItem* item) override { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(download_item_, item); DownloadItem::DownloadState state = download_item_->GetState(); if (state == DownloadItem::COMPLETE || @@ -122,7 +122,7 @@ class DragDownloadFile::DragDownloadFileUI : public DownloadItem::Observer { } void OnDownloadDestroyed(DownloadItem* item) override { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(download_item_, item); if (!on_completed_.is_null()) { const bool is_complete = @@ -236,7 +236,7 @@ void DragDownloadFile::CheckThread() { #if defined(OS_WIN) DCHECK(drag_message_loop_ == base::MessageLoop::current()); #else - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); #endif } diff --git a/content/browser/download/mhtml_generation_manager.cc b/content/browser/download/mhtml_generation_manager.cc index d02d509..4ace987 100644 --- a/content/browser/download/mhtml_generation_manager.cc +++ b/content/browser/download/mhtml_generation_manager.cc @@ -98,7 +98,7 @@ MHTMLGenerationManager::~MHTMLGenerationManager() { void MHTMLGenerationManager::SaveMHTML(WebContents* web_contents, const base::FilePath& file, const GenerateMHTMLCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); int job_id = NewJob(web_contents, callback); @@ -113,7 +113,7 @@ void MHTMLGenerationManager::StreamMHTML( WebContents* web_contents, base::File browser_file, const GenerateMHTMLCallback& callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); int job_id = NewJob(web_contents, callback); @@ -134,7 +134,7 @@ void MHTMLGenerationManager::MHTMLGenerated(int job_id, int64 mhtml_data_size) { void MHTMLGenerationManager::CreateFile( int job_id, const base::FilePath& file_path, base::ProcessHandle renderer_process) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); base::File browser_file( file_path, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE); if (!browser_file.IsValid()) { @@ -160,7 +160,7 @@ void MHTMLGenerationManager::FileAvailable( int job_id, base::File browser_file, IPC::PlatformFileForTransit renderer_file) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!browser_file.IsValid()) { LOG(ERROR) << "Failed to create file"; JobFinished(job_id, -1); @@ -189,7 +189,7 @@ void MHTMLGenerationManager::FileAvailable( } void MHTMLGenerationManager::JobFinished(int job_id, int64 file_size) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); IDToJobMap::iterator iter = id_to_job_.find(job_id); if (iter == id_to_job_.end()) { NOTREACHED(); @@ -208,7 +208,7 @@ void MHTMLGenerationManager::JobFinished(int job_id, int64 file_size) { } void MHTMLGenerationManager::CloseFile(base::File file) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); file.Close(); } @@ -224,7 +224,7 @@ int MHTMLGenerationManager::NewJob(WebContents* web_contents, } void MHTMLGenerationManager::RenderProcessExited(Job* job) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); for (IDToJobMap::iterator it = id_to_job_.begin(); it != id_to_job_.end(); ++it) { if (it->second == job) { diff --git a/content/browser/download/save_file.cc b/content/browser/download/save_file.cc index 4404fc8..a5c7488 100644 --- a/content/browser/download/save_file.cc +++ b/content/browser/download/save_file.cc @@ -23,14 +23,14 @@ SaveFile::SaveFile(const SaveFileCreateInfo* info, bool calculate_hash) base::File(), net::BoundNetLog()), info_(info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(info); DCHECK(info->path.empty()); } SaveFile::~SaveFile() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); } DownloadInterruptReason SaveFile::Initialize() { diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index f96230e..e7e74c2 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -43,7 +43,7 @@ void SaveFileManager::Shutdown() { // Stop file thread operations. void SaveFileManager::OnShutdown() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); STLDeleteValues(&save_file_map_); } @@ -59,14 +59,14 @@ SaveFile* SaveFileManager::LookupSaveFile(int save_id) { // file a request from the file thread to the IO thread to generate a // unique save ID. int SaveFileManager::GetNextId() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); return next_id_++; } void SaveFileManager::RegisterStartingRequest(const GURL& save_url, SavePackage* save_package) { // Make sure it runs in the UI thread. - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); int contents_id = save_package->contents_id(); // Register this starting request. @@ -80,7 +80,7 @@ void SaveFileManager::RegisterStartingRequest(const GURL& save_url, SavePackage* SaveFileManager::UnregisterStartingRequest( const GURL& save_url, int contents_id) { // Make sure it runs in UI thread. - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); ContentsToStartingRequestsMap::iterator it = contents_starting_requests_.find(contents_id); @@ -104,7 +104,7 @@ SavePackage* SaveFileManager::UnregisterStartingRequest( // Look up a SavePackage according to a save id. SavePackage* SaveFileManager::LookupPackage(int save_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SavePackageMap::iterator it = packages_.find(save_id); if (it != packages_.end()) return it->second; @@ -121,7 +121,7 @@ void SaveFileManager::SaveURL( const base::FilePath& file_full_path, ResourceContext* context, SavePackage* save_package) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Register a saving job. RegisterStartingRequest(url, save_package); @@ -159,7 +159,7 @@ void SaveFileManager::SaveURL( void SaveFileManager::RemoveSaveFile(int save_id, const GURL& save_url, SavePackage* package) { DCHECK(package); - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // A save page job (SavePackage) can only have one manager, // so remove it if it exists. if (save_id == -1) { @@ -191,7 +191,7 @@ SavePackage* SaveFileManager::GetSavePackageFromRenderIds( void SaveFileManager::DeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, base::Bind(&SaveFileManager::OnDeleteDirectoryOrFile, @@ -212,7 +212,7 @@ void SaveFileManager::SendCancelRequest(int save_id) { // to create a SaveFile which will hold and finally destroy |info|. It will // then passes |info| to the UI thread for reporting saving status. void SaveFileManager::StartSave(SaveFileCreateInfo* info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(info); // No need to calculate hash. SaveFile* save_file = new SaveFile(info, false); @@ -236,7 +236,7 @@ void SaveFileManager::StartSave(SaveFileCreateInfo* info) { void SaveFileManager::UpdateSaveProgress(int save_id, net::IOBuffer* data, int data_len) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); SaveFile* save_file = LookupSaveFile(save_id); if (save_file) { DCHECK(save_file->InProgress()); @@ -267,7 +267,7 @@ void SaveFileManager::SaveFinished(int save_id, << " save_id = " << save_id << " save_url = \"" << save_url.spec() << "\"" << " is_success = " << is_success; - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); SaveFileMap::iterator it = save_file_map_.find(save_id); if (it != save_file_map_.end()) { SaveFile* save_file = it->second; @@ -300,7 +300,7 @@ void SaveFileManager::SaveFinished(int save_id, // Notifications sent from the file thread and run on the UI thread. void SaveFileManager::OnStartSave(const SaveFileCreateInfo* info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SavePackage* save_package = GetSavePackageFromRenderIds(info->render_process_id, info->render_view_id); @@ -334,7 +334,7 @@ void SaveFileManager::OnStartSave(const SaveFileCreateInfo* info) { void SaveFileManager::OnUpdateSaveProgress(int save_id, int64 bytes_so_far, bool write_success) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SavePackage* package = LookupPackage(save_id); if (package) package->UpdateSaveProgress(save_id, bytes_so_far, write_success); @@ -345,14 +345,14 @@ void SaveFileManager::OnUpdateSaveProgress(int save_id, int64 bytes_so_far, void SaveFileManager::OnSaveFinished(int save_id, int64 bytes_so_far, bool is_success) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SavePackage* package = LookupPackage(save_id); if (package) package->SaveFinished(save_id, bytes_so_far, is_success); } void SaveFileManager::OnErrorFinished(const GURL& save_url, int contents_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SavePackage* save_package = UnregisterStartingRequest(save_url, contents_id); if (save_package) save_package->SaveFailed(save_url); @@ -366,7 +366,7 @@ void SaveFileManager::OnSaveURL( int render_process_host_id, int render_view_id, ResourceContext* context) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); ResourceDispatcherHostImpl::Get()->BeginSaveFile(url, referrer, render_process_host_id, @@ -376,7 +376,7 @@ void SaveFileManager::OnSaveURL( void SaveFileManager::OnRequireSaveJobFromOtherSource( SaveFileCreateInfo* info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_EQ(info->save_id, -1); // Generate a unique save id. info->save_id = GetNextId(); @@ -388,7 +388,7 @@ void SaveFileManager::OnRequireSaveJobFromOtherSource( void SaveFileManager::ExecuteCancelSaveRequest(int render_process_id, int request_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); ResourceDispatcherHostImpl::Get()->CancelRequest( render_process_id, request_id); } @@ -401,7 +401,7 @@ void SaveFileManager::ExecuteCancelSaveRequest(int render_process_id, // sent from the UI thread, the saving job may have already completed and // won't exist in our map. void SaveFileManager::CancelSave(int save_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); SaveFileMap::iterator it = save_file_map_.find(save_id); if (it != save_file_map_.end()) { SaveFile* save_file = it->second; @@ -436,7 +436,7 @@ void SaveFileManager::CancelSave(int save_id) { void SaveFileManager::SaveLocalFile(const GURL& original_file_url, int save_id, int render_process_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); SaveFile* save_file = LookupSaveFile(save_id); if (!save_file) return; @@ -466,7 +466,7 @@ void SaveFileManager::SaveLocalFile(const GURL& original_file_url, void SaveFileManager::OnDeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(!full_path.empty()); base::DeleteFile(full_path, is_dir); @@ -478,7 +478,7 @@ void SaveFileManager::RenameAllFiles( int render_process_id, int render_view_id, int save_package_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (!resource_dir.empty() && !base::PathExists(resource_dir)) base::CreateDirectory(resource_dir); @@ -504,7 +504,7 @@ void SaveFileManager::RenameAllFiles( void SaveFileManager::OnFinishSavePageJob(int render_process_id, int render_view_id, int save_package_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); SavePackage* save_package = GetSavePackageFromRenderIds(render_process_id, render_view_id); @@ -515,7 +515,7 @@ void SaveFileManager::OnFinishSavePageJob(int render_process_id, void SaveFileManager::RemoveSavedFileFromFileMap( const SaveIDList& save_ids) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); for (SaveIDList::const_iterator i = save_ids.begin(); i != save_ids.end(); ++i) { diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index 8300c2d..b879939 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -291,7 +291,7 @@ void SavePackage::InternalInit() { bool SavePackage::Init( const SavePackageDownloadCreatedCallback& download_created_callback) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Set proper running state. if (wait_state_ != INITIALIZE) return false; @@ -322,7 +322,7 @@ bool SavePackage::Init( void SavePackage::InitWithDownloadItem( const SavePackageDownloadCreatedCallback& download_created_callback, DownloadItemImpl* item) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(item); download_ = item; download_->AddObserver(this); |