| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 9921c466d4b7833dbf51274110b6c409dffb22e7..8aae64363dad70c8b6a409e57587a355b151684b 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -534,7 +534,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
|
|
|
| user_manager::UserManager* user_manager = user_manager::UserManager::Get();
|
|
|
| - if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), NULL) &&
|
| + if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), nullptr) &&
|
| !user_manager->IsKnownUser(account_id)) {
|
| // When a device-local account is removed, its policy is deleted from disk
|
| // immediately. If a session using this account happens to be in progress,
|
| @@ -665,7 +665,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
|
|
|
| manager->SetState(session_manager->GetDefaultIMEState(profile()));
|
|
|
| - bool is_running_test = parameters().ui_task != NULL;
|
| + bool is_running_test = parameters().ui_task != nullptr;
|
| g_browser_process->platform_part()->InitializeSessionManager(
|
| parsed_command_line(), profile(), is_running_test);
|
| g_browser_process->platform_part()->SessionManager()->Start();
|
|
|