Commit 40a1b25d authored by kylechar's avatar kylechar Committed by Commit Bot

Fix scoped_refptr construction from NULL

This is a precursor to adding a new scoped_refptr(std::nullptr_t)
constructor. The implicit conversion from NULL to scoped_refptr<T>
causes a compilation error with the new constructor. Replace NULL with
nullptr in any files where this is a problem.

This CL was uploaded by git cl split.

R=estade@chromium.org

Bug: 1018887
Change-Id: I29b84b7807d2d1b87cea6db9967986ac3aba900a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1884998
Auto-Submit: kylechar <kylechar@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710057}
parent 68098faa
...@@ -77,7 +77,7 @@ class MessageCenterUiControllerTest : public testing::Test { ...@@ -77,7 +77,7 @@ class MessageCenterUiControllerTest : public testing::Test {
void TearDown() override { void TearDown() override {
ui_controller_.reset(); ui_controller_.reset();
delegate_.reset(); delegate_.reset();
message_center_ = NULL; message_center_ = nullptr;
message_center::MessageCenter::Shutdown(); message_center::MessageCenter::Shutdown();
} }
...@@ -208,7 +208,7 @@ TEST_F(MessageCenterUiControllerTest, ...@@ -208,7 +208,7 @@ TEST_F(MessageCenterUiControllerTest,
ASCIIToUTF16("Test Web Notification"), ASCIIToUTF16("Test Web Notification"),
ASCIIToUTF16("Notification message body."), gfx::Image(), ASCIIToUTF16("Notification message body."), gfx::Image(),
ASCIIToUTF16("www.test.org"), GURL(), DummyNotifierId(), ASCIIToUTF16("www.test.org"), GURL(), DummyNotifierId(),
message_center::RichNotificationData(), NULL /* delegate */)); message_center::RichNotificationData(), nullptr /* delegate */));
notification->SetSystemPriority(); notification->SetSystemPriority();
message_center_->AddNotification(std::move(notification)); message_center_->AddNotification(std::move(notification));
......
...@@ -62,7 +62,7 @@ class SessionStateNotificationBlockerTest ...@@ -62,7 +62,7 @@ class SessionStateNotificationBlockerTest
message_center::NOTIFICATION_TYPE_SIMPLE, "chromeos-id", message_center::NOTIFICATION_TYPE_SIMPLE, "chromeos-id",
UTF8ToUTF16("chromeos-title"), UTF8ToUTF16("chromeos-message"), UTF8ToUTF16("chromeos-title"), UTF8ToUTF16("chromeos-message"),
gfx::Image(), UTF8ToUTF16("chromeos-source"), GURL(), notifier_id, gfx::Image(), UTF8ToUTF16("chromeos-source"), GURL(), notifier_id,
message_center::RichNotificationData(), NULL); message_center::RichNotificationData(), nullptr);
if (notifier_id.id == kNotifierSystemPriority) if (notifier_id.id == kNotifierSystemPriority)
notification.set_priority(message_center::SYSTEM_PRIORITY); notification.set_priority(message_center::SYSTEM_PRIORITY);
return blocker_->ShouldShowNotificationAsPopup(notification); return blocker_->ShouldShowNotificationAsPopup(notification);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment