diff options
author | sdefresne <sdefresne@chromium.org> | 2016-02-18 02:35:58 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-18 10:36:57 +0000 |
commit | e5ca870ce113eb9f6c7b804b5707f606f85c389e (patch) | |
tree | 5c08f40df770529a0fadd3c74d7553b4bbee6051 /ios/web/net/request_tracker_impl_unittest.mm | |
parent | a8b3cb0b38cab9abdb57e161989bbdd558581a31 (diff) | |
download | chromium_src-e5ca870ce113eb9f6c7b804b5707f606f85c389e.zip chromium_src-e5ca870ce113eb9f6c7b804b5707f606f85c389e.tar.gz chromium_src-e5ca870ce113eb9f6c7b804b5707f606f85c389e.tar.bz2 |
Rename DCHECK_CURRENTLY_ON_WEB_THREAD to DCHECK_CURRENTLY_ON.
Chrome on iOS no longer has any dependency on content/ so there is no
risk of collision between the two macros.
Keep the DCHECK_CURRENTLY_ON_WEB_THREAD name as an alias until all the
downstream code has been ported to use the new name.
Port all client code to use the new name using tools/git/mffr.py and
"git cl format".
BUG=438202
Review URL: https://codereview.chromium.org/1713453002
Cr-Commit-Position: refs/heads/master@{#376135}
Diffstat (limited to 'ios/web/net/request_tracker_impl_unittest.mm')
-rw-r--r-- | ios/web/net/request_tracker_impl_unittest.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ios/web/net/request_tracker_impl_unittest.mm b/ios/web/net/request_tracker_impl_unittest.mm index 7f84317..2deaec1 100644 --- a/ios/web/net/request_tracker_impl_unittest.mm +++ b/ios/web/net/request_tracker_impl_unittest.mm @@ -147,7 +147,7 @@ class RequestTrackerTest : public PlatformTest { ~RequestTrackerTest() override {} void SetUp() override { - DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); + DCHECK_CURRENTLY_ON(web::WebThread::UI); request_group_id_.reset( [[NSString stringWithFormat:@"test%d", g_count++] retain]); @@ -160,7 +160,7 @@ class RequestTrackerTest : public PlatformTest { } void TearDown() override { - DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); + DCHECK_CURRENTLY_ON(web::WebThread::UI); tracker_->Close(); } @@ -199,7 +199,7 @@ class RequestTrackerTest : public PlatformTest { } NSString* WaitUntilLoop(bool (^condition)(void)) { - DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); + DCHECK_CURRENTLY_ON(web::WebThread::UI); base::Time maxDate = base::Time::Now() + base::TimeDelta::FromSeconds(10); while (!condition()) { if ([receiver_ error]) @@ -223,14 +223,14 @@ class RequestTrackerTest : public PlatformTest { } void TrimRequest(NSString* tab_id, const GURL& url) { - DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); + DCHECK_CURRENTLY_ON(web::WebThread::UI); receiver_.get()->value_ = 0.0f; receiver_.get()->max_ = 0.0f; tracker_->StartPageLoad(url, nil); } void EndPage(NSString* tab_id, const GURL& url) { - DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI); + DCHECK_CURRENTLY_ON(web::WebThread::UI); tracker_->FinishPageLoad(url, false); receiver_.get()->value_ = 0.0f; receiver_.get()->max_ = 0.0f; |