summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcreis <creis@chromium.org>2015-04-24 15:16:29 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-24 22:17:19 +0000
commit5c0d01db03d8ea58391de07754c75625ae8fd469 (patch)
tree01bcf29e9a3038dd9c553785482ae6172d328ad6
parent79d22ed2b74d0ff1082f6febfd3fd93c0574d130 (diff)
downloadchromium_src-5c0d01db03d8ea58391de07754c75625ae8fd469.zip
chromium_src-5c0d01db03d8ea58391de07754c75625ae8fd469.tar.gz
chromium_src-5c0d01db03d8ea58391de07754c75625ae8fd469.tar.bz2
Use nullptr in BrowserURLHandlerImpl constructor.
BUG=477065 TEST=Likely no behavior change; maybe eliminate a crash. Review URL: https://codereview.chromium.org/1071413004 Cr-Commit-Position: refs/heads/master@{#326901}
-rw-r--r--content/browser/browser_url_handler_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index 438feb3..63ddf49 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -89,7 +89,7 @@ BrowserURLHandlerImpl* BrowserURLHandlerImpl::GetInstance() {
}
BrowserURLHandlerImpl::BrowserURLHandlerImpl() :
- fixup_handler_(null_handler()) {
+ fixup_handler_(nullptr) {
AddHandlerPair(&DebugURLHandler, BrowserURLHandlerImpl::null_handler());
GetContentClient()->browser()->BrowserURLHandlerCreated(this);
@@ -102,7 +102,7 @@ BrowserURLHandlerImpl::~BrowserURLHandlerImpl() {
}
void BrowserURLHandlerImpl::SetFixupHandler(URLHandler handler) {
- DCHECK_EQ(null_handler(), fixup_handler_);
+ DCHECK(fixup_handler_ == nullptr);
fixup_handler_ = handler;
}