| Index: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
|
| diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
|
| index 36f37d475348d75b0bd85d1d81a74ef288313eea..31a93e6e387911e3c989f0607519b4da1537e608 100644
|
| --- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
|
| +++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
|
| @@ -92,7 +92,7 @@ IoThreadClientThrottle::IoThreadClientThrottle(int render_process_id,
|
| request_(request) { }
|
|
|
| IoThreadClientThrottle::~IoThreadClientThrottle() {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| g_webview_resource_dispatcher_host_delegate.Get().
|
| RemovePendingThrottleOnIoThread(this);
|
| }
|
| @@ -102,7 +102,7 @@ const char* IoThreadClientThrottle::GetNameForLogging() const {
|
| }
|
|
|
| void IoThreadClientThrottle::WillStartRequest(bool* defer) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (render_frame_id_ < 1)
|
| return;
|
| DCHECK(render_process_id_);
|
| @@ -129,7 +129,7 @@ void IoThreadClientThrottle::WillRedirectRequest(
|
|
|
| void IoThreadClientThrottle::OnIoThreadClientReady(int new_render_process_id,
|
| int new_render_frame_id) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| if (!MaybeBlockRequest()) {
|
| controller()->Resume();
|
| @@ -335,7 +335,7 @@ void AwResourceDispatcherHostDelegate::OnResponseStarted(
|
|
|
| void AwResourceDispatcherHostDelegate::RemovePendingThrottleOnIoThread(
|
| IoThreadClientThrottle* throttle) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| PendingThrottleMap::iterator it = pending_throttles_.find(
|
| FrameRouteIDPair(throttle->render_process_id(),
|
| throttle->render_frame_id()));
|
| @@ -373,7 +373,7 @@ void AwResourceDispatcherHostDelegate::AddPendingThrottleOnIoThread(
|
| int render_process_id,
|
| int render_frame_id_id,
|
| IoThreadClientThrottle* pending_throttle) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| pending_throttles_.insert(
|
| std::pair<FrameRouteIDPair, IoThreadClientThrottle*>(
|
| FrameRouteIDPair(render_process_id, render_frame_id_id),
|
| @@ -383,7 +383,7 @@ void AwResourceDispatcherHostDelegate::AddPendingThrottleOnIoThread(
|
| void AwResourceDispatcherHostDelegate::OnIoThreadClientReadyInternal(
|
| int new_render_process_id,
|
| int new_render_frame_id) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| PendingThrottleMap::iterator it = pending_throttles_.find(
|
| FrameRouteIDPair(new_render_process_id, new_render_frame_id));
|
|
|
|
|