From 9d434e21296a0e506552e3a660101efa3403a2fe Mon Sep 17 00:00:00 2001
From: "sky@chromium.org"
<sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 20 Jan 2014 08:59:52 +0000
Subject: Removes MessageLoop::Type checks in favor of IsCurrent on
MessageLoops.
This is part of removing the MessageLoop::Type enum.
BUG=none
TEST=none
R=darin@chromium.org
Review URL: https://codereview.chromium.org/141683005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245882 0039d316-1c4b-4281-b951-d872f2087c98
---
net/base/dns_reloader.cc | 2 +-
net/cert/cert_database_mac.cc | 2 +-
net/socket_stream/socket_stream.cc | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'net')
diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc
index 1902820..04abcb1 100644
--- a/net/base/dns_reloader.cc
+++ b/net/base/dns_reloader.cc
@@ -47,7 +47,7 @@ class DnsReloader : public net::NetworkChangeNotifier::DNSObserver {
// NetworkChangeNotifier::DNSObserver:
virtual void OnDNSChanged() OVERRIDE {
- DCHECK_EQ(base::MessageLoop::current()->type(), base::MessageLoop::TYPE_IO);
+ DCHECK(base::MessageLoopForIO::IsCurrent());
base::AutoLock l(lock_);
resolver_generation_++;
}
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
index 9427be3..3f405f3 100644
--- a/net/cert/cert_database_mac.cc
+++ b/net/cert/cert_database_mac.cc
@@ -31,7 +31,7 @@ class CertDatabase::Notifier {
registered_(false),
called_shutdown_(false) {
// Ensure an associated CFRunLoop.
- DCHECK(message_loop->IsType(base::MessageLoop::TYPE_UI));
+ DCHECK(base::MessageLoopForUI::IsCurrent());
task_runner_ = message_loop->message_loop_proxy();
task_runner_->PostTask(FROM_HERE,
base::Bind(&Notifier::Init,
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 64190f0..1682ddc 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -111,7 +111,7 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate)
metrics_(new SocketStreamMetrics(url)) {
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
- DCHECK_EQ(base::MessageLoop::TYPE_IO, base::MessageLoop::current()->type())
+ DCHECK(base::MessageLoopForIO::IsCurrent())
<< "The current base::MessageLoop must be TYPE_IO";
DCHECK(delegate_);
}
@@ -170,7 +170,7 @@ void SocketStream::CheckPrivacyMode() {
void SocketStream::Connect() {
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
- DCHECK_EQ(base::MessageLoop::TYPE_IO, base::MessageLoop::current()->type())
+ DCHECK(base::MessageLoopForIO::IsCurrent())
<< "The current base::MessageLoop must be TYPE_IO";
if (context_) {
context_->ssl_config_service()->GetSSLConfig(&server_ssl_config_);
@@ -203,7 +203,7 @@ size_t SocketStream::GetTotalSizeOfPendingWriteBufs() const {
bool SocketStream::SendData(const char* data, int len) {
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
- DCHECK_EQ(base::MessageLoop::TYPE_IO, base::MessageLoop::current()->type())
+ DCHECK(base::MessageLoopForIO::IsCurrent())
<< "The current base::MessageLoop must be TYPE_IO";
DCHECK_GT(len, 0);
@@ -250,7 +250,7 @@ bool SocketStream::SendData(const char* data, int len) {
void SocketStream::Close() {
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
- DCHECK_EQ(base::MessageLoop::TYPE_IO, base::MessageLoop::current()->type())
+ DCHECK(base::MessageLoopForIO::IsCurrent())
<< "The current base::MessageLoop must be TYPE_IO";
// If next_state_ is STATE_NONE, the socket was not opened, or already
// closed. So, return immediately.
@@ -265,7 +265,7 @@ void SocketStream::Close() {
void SocketStream::RestartWithAuth(const AuthCredentials& credentials) {
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
- DCHECK_EQ(base::MessageLoop::TYPE_IO, base::MessageLoop::current()->type())
+ DCHECK(base::MessageLoopForIO::IsCurrent())
<< "The current base::MessageLoop must be TYPE_IO";
DCHECK(proxy_auth_controller_.get());
if (!connection_->socket()) {
@@ -358,7 +358,7 @@ void SocketStream::DoClose() {
void SocketStream::Finish(int result) {
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
- DCHECK_EQ(base::MessageLoop::TYPE_IO, base::MessageLoop::current()->type())
+ DCHECK(base::MessageLoopForIO::IsCurrent())
<< "The current base::MessageLoop must be TYPE_IO";
DCHECK_LE(result, OK);
if (result == OK)
--
cgit v1.1