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/browser_state.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/browser_state.mm')
| -rw-r--r-- | ios/web/browser_state.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ios/web/browser_state.mm b/ios/web/browser_state.mm index 6d1eeeb..c341ff9 100644 --- a/ios/web/browser_state.mm +++ b/ios/web/browser_state.mm @@ -36,7 +36,7 @@ struct CertificatePolicyCacheHandle : public base::SupportsUserData::Data { // static scoped_refptr<CertificatePolicyCache> BrowserState::GetCertificatePolicyCache( BrowserState* browser_state) { - DCHECK_CURRENTLY_ON_WEB_THREAD(WebThread::UI); + DCHECK_CURRENTLY_ON(WebThread::UI); if (!browser_state->GetUserData(kCertificatePolicyCacheKeyName)) { CertificatePolicyCacheHandle* cert_cache_service_handle = new CertificatePolicyCacheHandle(new CertificatePolicyCache()); @@ -53,14 +53,14 @@ scoped_refptr<CertificatePolicyCache> BrowserState::GetCertificatePolicyCache( // static bool BrowserState::HasActiveStateManager(BrowserState* browser_state) { - DCHECK_CURRENTLY_ON_WEB_THREAD(WebThread::UI); + DCHECK_CURRENTLY_ON(WebThread::UI); return browser_state->GetUserData(kActiveStateManagerKeyName) != nullptr; } // static ActiveStateManager* BrowserState::GetActiveStateManager( BrowserState* browser_state) { - DCHECK_CURRENTLY_ON_WEB_THREAD(WebThread::UI); + DCHECK_CURRENTLY_ON(WebThread::UI); DCHECK(browser_state); ActiveStateManagerImpl* active_state_manager = @@ -77,7 +77,7 @@ ActiveStateManager* BrowserState::GetActiveStateManager( // static BrowsingDataPartition* BrowserState::GetBrowsingDataPartition( BrowserState* browser_state) { - DCHECK_CURRENTLY_ON_WEB_THREAD(WebThread::UI); + DCHECK_CURRENTLY_ON(WebThread::UI); DCHECK(browser_state); BrowsingDataPartitionImpl* browsing_data_partition = @@ -115,7 +115,7 @@ BrowserState::~BrowserState() { URLDataManagerIOSBackend* BrowserState::GetURLDataManagerIOSBackendOnIOThread() { - DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO); + DCHECK_CURRENTLY_ON(web::WebThread::IO); if (!url_data_manager_ios_backend_) url_data_manager_ios_backend_ = new URLDataManagerIOSBackend(); return url_data_manager_ios_backend_; |