ProfileManager::GetPrimaryUserProfile should return primary user

Bug: 898696
Change-Id: I0d9dd064a69cc54f8e983f0447a2388024bb5745
Reviewed-on: https://chromium-review.googlesource.com/c/1311127Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Stefan Kuhne <skuhne@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607405}

chrome/browser/profiles/profile_manager.cc

@@ -462,7 +462,7 @@ Profile* ProfileManager::GetPrimaryUserProfile() {
     return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
         profile_manager->user_data_dir());
   user_manager::UserManager* manager = user_manager::UserManager::Get();
-  const user_manager::User* user = manager->GetActiveUser();
+  const user_manager::User* user = manager->GetPrimaryUser();
   if (!user)  // Can be null in unit tests.
     return nullptr;
   // Note: The ProfileHelper will take care of guest profiles.