Commit 3f2515d5 authored by Eric Willigers's avatar Eric Willigers Committed by Commit Bot

ChromeLauncherController uses nullptr, not null

We now use nullptr instead of null
https://google.github.io/styleguide/cppguide.html#0_and_nullptr/NULL

Change-Id: If1dfab9f77ca09f3d5a5cbe922646886d7517ec0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089186
Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
Reviewed-by: default avatarNancy Wang <nancylingwang@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747538}
parent 0799b9eb
......@@ -263,7 +263,7 @@ ChromeLauncherController::ChromeLauncherController(Profile* profile,
MultiUserWindowManagerHelper::CreateInstance();
// On Chrome OS using multi profile we want to switch the content of the shelf
// with a user change. Note that for unit tests the instance can be NULL.
// with a user change. Note that for unit tests the instance can be nullptr.
if (SessionControllerClientImpl::IsMultiProfileAvailable()) {
user_switch_observer_.reset(
new ChromeLauncherControllerUserSwitchObserver(this));
......
......@@ -2011,7 +2011,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_V1AppNavigation) {
EXPECT_EQ(ash::STATUS_RUNNING, shelf_model()->ItemByID(id)->status);
// Find the browser which holds our app.
Browser* app_browser = NULL;
Browser* app_browser = nullptr;
const BrowserList* browser_list = BrowserList::GetInstance();
for (BrowserList::const_reverse_iterator it =
browser_list->begin_last_active();
......
......@@ -1060,7 +1060,7 @@ class WebContentsDestroyedWatcher : public content::WebContentsObserver {
explicit WebContentsDestroyedWatcher(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
message_loop_runner_(new content::MessageLoopRunner) {
EXPECT_TRUE(web_contents != NULL);
EXPECT_TRUE(web_contents != nullptr);
}
~WebContentsDestroyedWatcher() override {}
......@@ -2993,7 +2993,7 @@ TEST_F(ChromeLauncherControllerTest, Policy) {
// Removing |extension1_| from the policy should not be reflected in the
// launcher and pin will exist.
policy_value.Remove(0, NULL);
policy_value.Remove(0, nullptr);
profile()->GetTestingPrefService()->SetManagedPref(
prefs::kPolicyPinnedLauncherApps, policy_value.CreateDeepCopy());
EXPECT_EQ("Chrome, App1, App2", GetPinnedAppStatus());
......
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