Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions.

extensions/browser/api/storage/storage_frontend.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/storage/storage_frontend.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
@@ skipping 69 matching lines @@
     const scoped_refptr<SettingsStorageFactory>& factory,
     BrowserContext* context)
     : browser_context_(context) {
   Init(factory);
 }
 
 void StorageFrontend::Init(
     const scoped_refptr<SettingsStorageFactory>& factory) {
   observers_ = new SettingsObserverList();
   browser_context_observer_.reset(new DefaultObserver(browser_context_));
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!browser_context_->IsOffTheRecord());
 
   observers_->AddObserver(browser_context_observer_.get());
 
   caches_[settings_namespace::LOCAL] =
       new LocalValueStoreCache(factory, browser_context_->GetPath());
 
   // Add any additional caches the embedder supports (for example, caches
   // for chrome.storage.managed and chrome.storage.sync).
   ExtensionsAPIClient::Get()->AddAdditionalValueStoreCaches(
       browser_context_, factory, observers_, &caches_);
 }
 
 StorageFrontend::~StorageFrontend() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   observers_->RemoveObserver(browser_context_observer_.get());
   for (CacheMap::iterator it = caches_.begin(); it != caches_.end(); ++it) {
     ValueStoreCache* cache = it->second;
     cache->ShutdownOnUI();
     BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE, cache);
   }
 }
 
 ValueStoreCache* StorageFrontend::GetValueStoreCache(
     settings_namespace::Namespace settings_namespace) const {
   CacheMap::const_iterator it = caches_.find(settings_namespace);
   if (it != caches_.end())
     return it->second;
   return NULL;
 }
 
 bool StorageFrontend::IsStorageEnabled(
     settings_namespace::Namespace settings_namespace) const {
   return caches_.find(settings_namespace) != caches_.end();
 }
 
 void StorageFrontend::RunWithStorage(
     scoped_refptr<const Extension> extension,
     settings_namespace::Namespace settings_namespace,
     const ValueStoreCache::StorageCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CHECK(extension.get());
 
   ValueStoreCache* cache = caches_[settings_namespace];
   CHECK(cache);
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&ValueStoreCache::RunWithValueStoreForExtension,
                  base::Unretained(cache), callback, extension));
 }
 
 void StorageFrontend::DeleteStorageSoon(const std::string& extension_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (CacheMap::iterator it = caches_.begin(); it != caches_.end(); ++it) {
     ValueStoreCache* cache = it->second;
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&ValueStoreCache::DeleteStorageSoon,
                    base::Unretained(cache),
                    extension_id));
   }
 }
 
 scoped_refptr<SettingsObserverList> StorageFrontend::GetObservers() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return observers_;
 }
 
 void StorageFrontend::DisableStorageForTesting(
     settings_namespace::Namespace settings_namespace) {
   CacheMap::iterator it = caches_.find(settings_namespace);
   if (it != caches_.end()) {
     ValueStoreCache* cache = it->second;
     cache->ShutdownOnUI();
     BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE, cache);
     caches_.erase(it);
   }
 }
 
 // BrowserContextKeyedAPI implementation.
 
 // static
 BrowserContextKeyedAPIFactory<StorageFrontend>*
 StorageFrontend::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 const char* StorageFrontend::service_name() { return "StorageFrontend"; }
 
 }  // namespace extensions