summaryrefslogtreecommitdiffstats
path: root/extensions/browser
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/browser')
-rw-r--r--extensions/browser/api/api_resource_manager.h14
-rw-r--r--extensions/browser/api/async_api_function.cc6
-rw-r--r--extensions/browser/api/dns/dns_api.cc4
-rw-r--r--extensions/browser/api/socket/socket_api.cc4
-rw-r--r--extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc16
-rw-r--r--extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc16
-rw-r--r--extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc12
-rw-r--r--extensions/browser/api/storage/local_value_store_cache.cc8
-rw-r--r--extensions/browser/api/storage/storage_frontend.cc10
-rw-r--r--extensions/browser/event_router.cc2
-rw-r--r--extensions/browser/extension_function_dispatcher.cc2
-rw-r--r--extensions/browser/extension_message_filter.cc2
-rw-r--r--extensions/browser/info_map.cc4
-rw-r--r--extensions/browser/value_store/leveldb_value_store.cc30
-rw-r--r--extensions/browser/value_store/value_store_frontend.cc12
15 files changed, 70 insertions, 72 deletions
diff --git a/extensions/browser/api/api_resource_manager.h b/extensions/browser/api/api_resource_manager.h
index a3c7740..6374abe 100644
--- a/extensions/browser/api/api_resource_manager.h
+++ b/extensions/browser/api/api_resource_manager.h
@@ -176,7 +176,7 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
: next_id_(1), thread_id_(thread_id) {}
int Add(T* api_resource) {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
int id = GenerateId();
if (id > 0) {
linked_ptr<T> resource_ptr(api_resource);
@@ -195,7 +195,7 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
}
void Remove(const std::string& extension_id, int api_resource_id) {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
if (GetOwnedResource(extension_id, api_resource_id) != NULL) {
DCHECK(extension_resource_map_.find(extension_id) !=
extension_resource_map_.end());
@@ -205,12 +205,12 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
}
T* Get(const std::string& extension_id, int api_resource_id) {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
return GetOwnedResource(extension_id, api_resource_id);
}
base::hash_set<int>* GetResourceIds(const std::string& extension_id) {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
return GetOwnedResourceIds(extension_id);
}
@@ -251,7 +251,7 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
}
base::hash_set<int>* GetOwnedResourceIds(const std::string& extension_id) {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
if (extension_resource_map_.find(extension_id) ==
extension_resource_map_.end())
return NULL;
@@ -271,7 +271,7 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
void CleanupResourcesFromExtension(const std::string& extension_id,
bool remove_all) {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
if (extension_resource_map_.find(extension_id) ==
extension_resource_map_.end()) {
@@ -307,7 +307,7 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
}
void Cleanup() {
- DCHECK(content::BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
api_resource_map_.clear();
extension_resource_map_.clear();
diff --git a/extensions/browser/api/async_api_function.cc b/extensions/browser/api/async_api_function.cc
index 2ed484d..1152f208 100644
--- a/extensions/browser/api/async_api_function.cc
+++ b/extensions/browser/api/async_api_function.cc
@@ -17,7 +17,7 @@ AsyncApiFunction::AsyncApiFunction() : work_thread_id_(BrowserThread::IO) {}
AsyncApiFunction::~AsyncApiFunction() {}
bool AsyncApiFunction::RunImpl() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!PrePrepare() || !Prepare()) {
return false;
@@ -52,7 +52,7 @@ void AsyncApiFunction::AsyncWorkCompleted() {
}
void AsyncApiFunction::WorkOnWorkThread() {
- DCHECK(BrowserThread::CurrentlyOn(work_thread_id_));
+ DCHECK_CURRENTLY_ON(work_thread_id_);
DLOG_IF(ERROR, (work_thread_id_ == BrowserThread::UI))
<< "You have specified that AsyncApiFunction::Work() should happen on "
"the UI thread. This nullifies the point of this class. Either "
@@ -61,7 +61,7 @@ void AsyncApiFunction::WorkOnWorkThread() {
}
void AsyncApiFunction::RespondOnUIThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
SendResponse(Respond());
}
diff --git a/extensions/browser/api/dns/dns_api.cc b/extensions/browser/api/dns/dns_api.cc
index 43ffc32..a3a7eb1 100644
--- a/extensions/browser/api/dns/dns_api.cc
+++ b/extensions/browser/api/dns/dns_api.cc
@@ -46,7 +46,7 @@ bool DnsResolveFunction::RunImpl() {
}
void DnsResolveFunction::WorkOnIOThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
net::HostResolver* host_resolver =
HostResolverWrapper::GetInstance()->GetHostResolver(
@@ -76,7 +76,7 @@ void DnsResolveFunction::WorkOnIOThread() {
}
void DnsResolveFunction::RespondOnUIThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
SendResponse(response_);
}
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 280e927c..5d40b84 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -668,14 +668,14 @@ void SocketGetNetworkListFunction::GetNetworkListOnFileThread() {
}
void SocketGetNetworkListFunction::HandleGetNetworkListError() {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
error_ = kNetworkListError;
SendResponse(false);
}
void SocketGetNetworkListFunction::SendResponseOnUIThread(
const net::NetworkInterfaceList& interface_list) {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
std::vector<linked_ptr<core_api::socket::NetworkInterface> > create_arg;
create_arg.reserve(interface_list.size());
diff --git a/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc b/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
index 11d4cee..92e58da 100644
--- a/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
@@ -32,7 +32,7 @@ TCPSocketEventDispatcher::GetFactoryInstance() {
// static
TCPSocketEventDispatcher* TCPSocketEventDispatcher::Get(
content::BrowserContext* context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
return BrowserContextKeyedAPIFactory<TCPSocketEventDispatcher>::Get(context);
}
@@ -58,21 +58,21 @@ TCPSocketEventDispatcher::ReadParams::~ReadParams() {}
void TCPSocketEventDispatcher::OnSocketConnect(const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
StartSocketRead(extension_id, socket_id);
}
void TCPSocketEventDispatcher::OnSocketResume(const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
StartSocketRead(extension_id, socket_id);
}
void TCPSocketEventDispatcher::StartSocketRead(const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
ReadParams params;
params.thread_id = thread_id_;
@@ -86,7 +86,7 @@ void TCPSocketEventDispatcher::StartSocketRead(const std::string& extension_id,
// static
void TCPSocketEventDispatcher::StartRead(const ReadParams& params) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
ResumableTCPSocket* socket =
params.sockets->Get(params.extension_id, params.socket_id);
@@ -113,7 +113,7 @@ void TCPSocketEventDispatcher::ReadCallback(
const ReadParams& params,
int bytes_read,
scoped_refptr<net::IOBuffer> io_buffer) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
// If |bytes_read| == 0, the connection has been closed by the peer.
// If |bytes_read| < 0, there was a network error, and |bytes_read| is a value
@@ -168,7 +168,7 @@ void TCPSocketEventDispatcher::ReadCallback(
// static
void TCPSocketEventDispatcher::PostEvent(const ReadParams& params,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
@@ -182,7 +182,7 @@ void TCPSocketEventDispatcher::PostEvent(const ReadParams& params,
void TCPSocketEventDispatcher::DispatchEvent(void* browser_context_id,
const std::string& extension_id,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::BrowserContext* context =
reinterpret_cast<content::BrowserContext*>(browser_context_id);
diff --git a/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
index 31eeeab..2818857 100644
--- a/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
@@ -28,7 +28,7 @@ TCPServerSocketEventDispatcher::GetFactoryInstance() {
// static
TCPServerSocketEventDispatcher* TCPServerSocketEventDispatcher::Get(
content::BrowserContext* context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
return BrowserContextKeyedAPIFactory<TCPServerSocketEventDispatcher>::Get(
context);
@@ -65,7 +65,7 @@ TCPServerSocketEventDispatcher::AcceptParams::~AcceptParams() {}
void TCPServerSocketEventDispatcher::OnServerSocketListen(
const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
StartSocketAccept(extension_id, socket_id);
}
@@ -73,7 +73,7 @@ void TCPServerSocketEventDispatcher::OnServerSocketListen(
void TCPServerSocketEventDispatcher::OnServerSocketResume(
const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
StartSocketAccept(extension_id, socket_id);
}
@@ -81,7 +81,7 @@ void TCPServerSocketEventDispatcher::OnServerSocketResume(
void TCPServerSocketEventDispatcher::StartSocketAccept(
const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
AcceptParams params;
params.thread_id = thread_id_;
@@ -96,7 +96,7 @@ void TCPServerSocketEventDispatcher::StartSocketAccept(
// static
void TCPServerSocketEventDispatcher::StartAccept(const AcceptParams& params) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
ResumableTCPServerSocket* socket =
params.server_sockets->Get(params.extension_id, params.socket_id);
@@ -120,7 +120,7 @@ void TCPServerSocketEventDispatcher::AcceptCallback(
const AcceptParams& params,
int result_code,
net::TCPClientSocket* socket) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
if (result_code >= 0) {
ResumableTCPSocket* client_socket =
@@ -169,7 +169,7 @@ void TCPServerSocketEventDispatcher::AcceptCallback(
// static
void TCPServerSocketEventDispatcher::PostEvent(const AcceptParams& params,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
@@ -184,7 +184,7 @@ void TCPServerSocketEventDispatcher::DispatchEvent(
void* browser_context_id,
const std::string& extension_id,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::BrowserContext* context =
reinterpret_cast<content::BrowserContext*>(browser_context_id);
diff --git a/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc b/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc
index e985dfb..09fd3f4 100644
--- a/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc
@@ -28,7 +28,7 @@ UDPSocketEventDispatcher::GetFactoryInstance() {
// static
UDPSocketEventDispatcher* UDPSocketEventDispatcher::Get(
content::BrowserContext* context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
return BrowserContextKeyedAPIFactory<UDPSocketEventDispatcher>::Get(context);
}
@@ -59,7 +59,7 @@ void UDPSocketEventDispatcher::OnSocketBind(const std::string& extension_id,
void UDPSocketEventDispatcher::OnSocketResume(const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
ReceiveParams params;
params.thread_id = thread_id_;
@@ -73,7 +73,7 @@ void UDPSocketEventDispatcher::OnSocketResume(const std::string& extension_id,
/* static */
void UDPSocketEventDispatcher::StartReceive(const ReceiveParams& params) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
ResumableUDPSocket* socket =
params.sockets->Get(params.extension_id, params.socket_id);
@@ -101,7 +101,7 @@ void UDPSocketEventDispatcher::ReceiveCallback(
scoped_refptr<net::IOBuffer> io_buffer,
const std::string& address,
int port) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
// If |bytes_read| == 0, the message contained no data.
// If |bytes_read| < 0, there was a network error, and |bytes_read| is a value
@@ -154,7 +154,7 @@ void UDPSocketEventDispatcher::ReceiveCallback(
/* static */
void UDPSocketEventDispatcher::PostEvent(const ReceiveParams& params,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
@@ -168,7 +168,7 @@ void UDPSocketEventDispatcher::PostEvent(const ReceiveParams& params,
void UDPSocketEventDispatcher::DispatchEvent(void* browser_context_id,
const std::string& extension_id,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::BrowserContext* context =
reinterpret_cast<content::BrowserContext*>(browser_context_id);
diff --git a/extensions/browser/api/storage/local_value_store_cache.cc b/extensions/browser/api/storage/local_value_store_cache.cc
index 6d05ca2..6946f33 100644
--- a/extensions/browser/api/storage/local_value_store_cache.cc
+++ b/extensions/browser/api/storage/local_value_store_cache.cc
@@ -46,17 +46,17 @@ LocalValueStoreCache::LocalValueStoreCache(
profile_path.AppendASCII(kLocalExtensionSettingsDirectoryName)),
app_base_path_(profile_path.AppendASCII(kLocalAppSettingsDirectoryName)),
quota_(GetLocalQuotaLimits()) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
LocalValueStoreCache::~LocalValueStoreCache() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
}
void LocalValueStoreCache::RunWithValueStoreForExtension(
const StorageCallback& callback,
scoped_refptr<const Extension> extension) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
ValueStore* storage = GetStorage(extension);
@@ -71,7 +71,7 @@ void LocalValueStoreCache::RunWithValueStoreForExtension(
}
void LocalValueStoreCache::DeleteStorageSoon(const std::string& extension_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
storage_map_.erase(extension_id);
storage_factory_->DeleteDatabaseIfExists(app_base_path_, extension_id);
storage_factory_->DeleteDatabaseIfExists(extension_base_path_, extension_id);
diff --git a/extensions/browser/api/storage/storage_frontend.cc b/extensions/browser/api/storage/storage_frontend.cc
index 503205d..836858d 100644
--- a/extensions/browser/api/storage/storage_frontend.cc
+++ b/extensions/browser/api/storage/storage_frontend.cc
@@ -87,7 +87,7 @@ 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());
@@ -102,7 +102,7 @@ void StorageFrontend::Init(
}
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;
@@ -128,7 +128,7 @@ 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];
@@ -141,7 +141,7 @@ void StorageFrontend::RunWithStorage(
}
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(
@@ -153,7 +153,7 @@ void StorageFrontend::DeleteStorageSoon(const std::string& extension_id) {
}
scoped_refptr<SettingsObserverList> StorageFrontend::GetObservers() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
return observers_;
}
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
index a12dbe2..4a165e3 100644
--- a/extensions/browser/event_router.cc
+++ b/extensions/browser/event_router.cc
@@ -610,7 +610,7 @@ bool EventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent(
void EventRouter::IncrementInFlightEventsOnUI(
void* browser_context_id,
const std::string& extension_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserContext* browser_context =
reinterpret_cast<BrowserContext*>(browser_context_id);
if (!ExtensionsBrowserClient::Get()->IsValidContext(browser_context))
diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
index 3e29582..e5ab1e4 100644
--- a/extensions/browser/extension_function_dispatcher.cc
+++ b/extensions/browser/extension_function_dispatcher.cc
@@ -163,7 +163,7 @@ class ExtensionFunctionDispatcher::UIThreadResponseCallbackWrapper
// content::WebContentsObserver overrides.
virtual void RenderViewDeleted(
RenderViewHost* render_view_host) OVERRIDE {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (render_view_host != render_view_host_)
return;
diff --git a/extensions/browser/extension_message_filter.cc b/extensions/browser/extension_message_filter.cc
index bcd5621..d31f6e0 100644
--- a/extensions/browser/extension_message_filter.cc
+++ b/extensions/browser/extension_message_filter.cc
@@ -23,7 +23,7 @@ ExtensionMessageFilter::ExtensionMessageFilter(int render_process_id,
: BrowserMessageFilter(ExtensionMsgStart),
render_process_id_(render_process_id),
browser_context_(context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
ExtensionMessageFilter::~ExtensionMessageFilter() {}
diff --git a/extensions/browser/info_map.cc b/extensions/browser/info_map.cc
index 7122eb0..408b4f1 100644
--- a/extensions/browser/info_map.cc
+++ b/extensions/browser/info_map.cc
@@ -16,9 +16,7 @@ namespace extensions {
namespace {
-void CheckOnValidThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-}
+void CheckOnValidThread() { DCHECK_CURRENTLY_ON(BrowserThread::IO); }
} // namespace
diff --git a/extensions/browser/value_store/leveldb_value_store.cc b/extensions/browser/value_store/leveldb_value_store.cc
index 58a8cb5..0f09f5b 100644
--- a/extensions/browser/value_store/leveldb_value_store.cc
+++ b/extensions/browser/value_store/leveldb_value_store.cc
@@ -48,7 +48,7 @@ class ScopedSnapshot {
LeveldbValueStore::LeveldbValueStore(const base::FilePath& db_path)
: db_path_(db_path) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -56,7 +56,7 @@ LeveldbValueStore::LeveldbValueStore(const base::FilePath& db_path)
}
LeveldbValueStore::~LeveldbValueStore() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
// Delete the database from disk if it's empty (but only if we managed to
// open it!). This is safe on destruction, assuming that we have exclusive
@@ -85,7 +85,7 @@ size_t LeveldbValueStore::GetBytesInUse() {
}
ValueStore::ReadResult LeveldbValueStore::Get(const std::string& key) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -104,7 +104,7 @@ ValueStore::ReadResult LeveldbValueStore::Get(const std::string& key) {
ValueStore::ReadResult LeveldbValueStore::Get(
const std::vector<std::string>& keys) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -131,7 +131,7 @@ ValueStore::ReadResult LeveldbValueStore::Get(
}
ValueStore::ReadResult LeveldbValueStore::Get() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -169,7 +169,7 @@ ValueStore::ReadResult LeveldbValueStore::Get() {
ValueStore::WriteResult LeveldbValueStore::Set(
WriteOptions options, const std::string& key, const base::Value& value) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -189,7 +189,7 @@ ValueStore::WriteResult LeveldbValueStore::Set(
ValueStore::WriteResult LeveldbValueStore::Set(
WriteOptions options, const base::DictionaryValue& settings) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -212,13 +212,13 @@ ValueStore::WriteResult LeveldbValueStore::Set(
}
ValueStore::WriteResult LeveldbValueStore::Remove(const std::string& key) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
return Remove(std::vector<std::string>(1, key));
}
ValueStore::WriteResult LeveldbValueStore::Remove(
const std::vector<std::string>& keys) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<Error> open_error = EnsureDbIsOpen();
if (open_error)
@@ -248,7 +248,7 @@ ValueStore::WriteResult LeveldbValueStore::Remove(
}
ValueStore::WriteResult LeveldbValueStore::Clear() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
@@ -270,7 +270,7 @@ ValueStore::WriteResult LeveldbValueStore::Clear() {
}
bool LeveldbValueStore::Restore() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
ReadResult result = Get();
std::string previous_key;
@@ -297,7 +297,7 @@ bool LeveldbValueStore::Restore() {
}
bool LeveldbValueStore::RestoreKey(const std::string& key) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
ReadResult result = Get(key);
if (result->IsCorrupted()) {
@@ -319,7 +319,7 @@ bool LeveldbValueStore::WriteToDbForTest(leveldb::WriteBatch* batch) {
}
scoped_ptr<ValueStore::Error> LeveldbValueStore::EnsureDbIsOpen() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
if (db_)
return util::NoError();
@@ -343,7 +343,7 @@ scoped_ptr<ValueStore::Error> LeveldbValueStore::ReadFromDb(
leveldb::ReadOptions options,
const std::string& key,
scoped_ptr<base::Value>* setting) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
DCHECK(setting);
std::string value_as_json;
@@ -405,7 +405,7 @@ scoped_ptr<ValueStore::Error> LeveldbValueStore::WriteToDb(
}
bool LeveldbValueStore::IsEmpty() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
scoped_ptr<leveldb::Iterator> it(db_->NewIterator(leveldb::ReadOptions()));
it->SeekToFirst();
diff --git a/extensions/browser/value_store/value_store_frontend.cc b/extensions/browser/value_store/value_store_frontend.cc
index 6ef11cc..73b6aff 100644
--- a/extensions/browser/value_store/value_store_frontend.cc
+++ b/extensions/browser/value_store/value_store_frontend.cc
@@ -18,7 +18,7 @@ class ValueStoreFrontend::Backend : public base::RefCountedThreadSafe<Backend> {
Backend() : storage_(NULL) {}
void Init(const base::FilePath& db_path) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
DCHECK(!storage_);
TRACE_EVENT0("ValueStoreFrontend::Backend", "Init");
db_path_ = db_path;
@@ -27,14 +27,14 @@ class ValueStoreFrontend::Backend : public base::RefCountedThreadSafe<Backend> {
// This variant is useful for testing (using a mock ValueStore).
void InitWithStore(scoped_ptr<ValueStore> storage) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
DCHECK(!storage_);
storage_ = storage.release();
}
void Get(const std::string& key,
const ValueStoreFrontend::ReadCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
ValueStore::ReadResult result = storage_->Get(key);
// Extract the value from the ReadResult and pass ownership of it to the
@@ -53,14 +53,14 @@ class ValueStoreFrontend::Backend : public base::RefCountedThreadSafe<Backend> {
}
void Set(const std::string& key, scoped_ptr<base::Value> value) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
// We don't need the old value, so skip generating changes.
storage_->Set(ValueStore::IGNORE_QUOTA | ValueStore::NO_GENERATE_CHANGES,
key, *value.get());
}
void Remove(const std::string& key) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE);
storage_->Remove(key);
}
@@ -77,7 +77,7 @@ class ValueStoreFrontend::Backend : public base::RefCountedThreadSafe<Backend> {
void RunCallback(const ValueStoreFrontend::ReadCallback& callback,
scoped_ptr<base::Value> value) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
callback.Run(value.Pass());
}
generated by cgit v1.1 at 2025-02-05 20:38:39 +0000