| Index: android_webview/native/aw_contents_io_thread_client_impl.cc
|
| diff --git a/android_webview/native/aw_contents_io_thread_client_impl.cc b/android_webview/native/aw_contents_io_thread_client_impl.cc
|
| index 0cadc9491f02355c4224bd89d9a232d3471f86cd..098806500cddbab50c48a72899230974ae1278b4 100644
|
| --- a/android_webview/native/aw_contents_io_thread_client_impl.cc
|
| +++ b/android_webview/native/aw_contents_io_thread_client_impl.cc
|
| @@ -224,7 +224,7 @@ bool AwContentsIoThreadClientImpl::PendingAssociation() const {
|
|
|
| AwContentsIoThreadClient::CacheMode
|
| AwContentsIoThreadClientImpl::GetCacheMode() const {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return AwContentsIoThreadClient::LOAD_DEFAULT;
|
|
|
| @@ -238,7 +238,7 @@ scoped_ptr<AwWebResourceResponse>
|
| AwContentsIoThreadClientImpl::ShouldInterceptRequest(
|
| const GURL& location,
|
| const net::URLRequest* request) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return scoped_ptr<AwWebResourceResponse>();
|
| const content::ResourceRequestInfo* info =
|
| @@ -288,7 +288,7 @@ AwContentsIoThreadClientImpl::ShouldInterceptRequest(
|
| }
|
|
|
| bool AwContentsIoThreadClientImpl::ShouldBlockContentUrls() const {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return false;
|
|
|
| @@ -298,7 +298,7 @@ bool AwContentsIoThreadClientImpl::ShouldBlockContentUrls() const {
|
| }
|
|
|
| bool AwContentsIoThreadClientImpl::ShouldBlockFileUrls() const {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return false;
|
|
|
| @@ -308,7 +308,7 @@ bool AwContentsIoThreadClientImpl::ShouldBlockFileUrls() const {
|
| }
|
|
|
| bool AwContentsIoThreadClientImpl::ShouldAcceptThirdPartyCookies() const {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return false;
|
|
|
| @@ -318,7 +318,7 @@ bool AwContentsIoThreadClientImpl::ShouldAcceptThirdPartyCookies() const {
|
| }
|
|
|
| bool AwContentsIoThreadClientImpl::ShouldBlockNetworkLoads() const {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return false;
|
|
|
| @@ -333,7 +333,7 @@ void AwContentsIoThreadClientImpl::NewDownload(
|
| const string& content_disposition,
|
| const string& mime_type,
|
| int64 content_length) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return;
|
|
|
| @@ -360,7 +360,7 @@ void AwContentsIoThreadClientImpl::NewDownload(
|
| void AwContentsIoThreadClientImpl::NewLoginRequest(const string& realm,
|
| const string& account,
|
| const string& args) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return;
|
|
|
| @@ -379,7 +379,7 @@ void AwContentsIoThreadClientImpl::NewLoginRequest(const string& realm,
|
| void AwContentsIoThreadClientImpl::OnReceivedHttpError(
|
| const net::URLRequest* request,
|
| const net::HttpResponseHeaders* response_headers) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (java_object_.is_null())
|
| return;
|
|
|
|
|