Change ProfileManager::CreateProfileHelper() to return std::unique_ptr.

Clearly indicate pointer ownership. Fix nits along the way.

Change-Id: I721a6c543197f18effe5b050885b7a9a8f3f524b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1843394Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703800}

chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc

@@ -178,8 +178,9 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit {
   }
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& path) override {
-    return new TestingProfile(path, NULL);
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    return std::make_unique<TestingProfile>(path);
   }
 
   std::unique_ptr<Profile> CreateProfileAsyncHelper(

chrome/browser/chromeos/login/users/user_manager_unittest.cc

@@ -44,12 +44,11 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit {
       : ::ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
-    if (!base::PathExists(file_path)) {
-      if (!base::CreateDirectory(file_path))
-        return NULL;
-    }
-    return new TestingProfile(file_path, NULL);
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    if (!base::PathExists(path) && !base::CreateDirectory(path))
+      return nullptr;
+    return std::make_unique<TestingProfile>(path);
   }
 };
 

chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc

@@ -39,8 +39,8 @@ using content::WebContentsTester;
 
 namespace {
 
-static const int kDefaultSourceCount = 2;
-static const int kThumbnailSize = 50;
+constexpr int kDefaultSourceCount = 2;
+constexpr int kThumbnailSize = 50;
 
 class UnittestProfileManager : public ::ProfileManagerWithoutInit {
  public:
@@ -48,12 +48,11 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit {
       : ::ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
-    if (!base::PathExists(file_path)) {
-      if (!base::CreateDirectory(file_path))
-        return NULL;
-    }
-    return new TestingProfile(file_path, NULL);
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    if (!base::PathExists(path) && !base::CreateDirectory(path))
+      return nullptr;
+    return std::make_unique<TestingProfile>(path);
   }
 };
 

chrome/browser/profiles/profile_manager.cc

@@ -371,7 +371,7 @@ ProfileManager::~ProfileManager() {
 // static
 void ProfileManager::ShutdownSessionServices() {
   ProfileManager* pm = g_browser_process->profile_manager();
-  if (!pm)  // Is NULL when running unit tests.
+  if (!pm)  // Is nullptr when running unit tests.
     return;
   std::vector<Profile*> profiles(pm->GetLoadedProfiles());
   for (size_t i = 0; i < profiles.size(); ++i)
@@ -549,13 +549,13 @@ void ProfileManager::CreateProfileAsync(const base::FilePath& profile_path,
   // Make sure that this profile is not pending deletion.
   if (IsProfileDirectoryMarkedForDeletion(profile_path)) {
     if (!callback.is_null())
-      callback.Run(NULL, Profile::CREATE_STATUS_LOCAL_FAIL);
+      callback.Run(nullptr, Profile::CREATE_STATUS_LOCAL_FAIL);
     return;
   }
 
   // Create the profile if needed and collect its ProfileInfo.
   auto iter = profiles_info_.find(profile_path);
-  ProfileInfo* info = NULL;
+  ProfileInfo* info = nullptr;
 
   if (iter != profiles_info_.end()) {
     info = iter->second.get();
@@ -1133,7 +1133,7 @@ void ProfileManager::OnProfileCreated(Profile* profile,
     if (go_off_the_record)
       profile = profile->GetOffTheRecordProfile();
   } else {
-    profile = NULL;
+    profile = nullptr;
     profiles_info_.erase(iter);
   }
 
@@ -1154,11 +1154,12 @@ void ProfileManager::OnProfileCreated(Profile* profile,
                          Profile::CREATE_STATUS_LOCAL_FAIL);
 }
 
-Profile* ProfileManager::CreateProfileHelper(const base::FilePath& path) {
+std::unique_ptr<Profile> ProfileManager::CreateProfileHelper(
+    const base::FilePath& path) {
   TRACE_EVENT0("browser", "ProfileManager::CreateProfileHelper");
 
-  return Profile::CreateProfile(path, nullptr, Profile::CREATE_MODE_SYNCHRONOUS)
-      .release();
+  return Profile::CreateProfile(path, nullptr,
+                                Profile::CREATE_MODE_SYNCHRONOUS);
 }
 
 std::unique_ptr<Profile> ProfileManager::CreateProfileAsyncHelper(
@@ -1392,12 +1393,14 @@ Profile* ProfileManager::CreateAndInitializeProfile(
   // already started loading the profile but it is not fully initialized yet,
   // which would make Bad Things happen if we returned it.
   CHECK(!GetProfileByPathInternal(profile_dir));
-  Profile* profile = CreateProfileHelper(profile_dir);
-  if (profile) {
-    bool result = AddProfile(base::WrapUnique(profile));
-    DCHECK(result);
-  }
-  return profile;
+  std::unique_ptr<Profile> profile = CreateProfileHelper(profile_dir);
+  if (!profile)
+    return nullptr;
+
+  Profile* profile_ptr = profile.get();
+  bool result = AddProfile(std::move(profile));
+  DCHECK(result);
+  return profile_ptr;
 }
 
 #if !defined(OS_ANDROID)
@@ -1410,8 +1413,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
   const base::FilePath guest_profile_path = GetGuestProfilePath();
   Profile* last_used_profile = GetProfileByPath(last_used_profile_path);
   if (last_used_profile_path != profile_dir &&
-      last_used_profile_path != guest_profile_path &&
-      last_used_profile != nullptr &&
+      last_used_profile_path != guest_profile_path && last_used_profile &&
       !last_used_profile->IsLegacySupervised()) {
     FinishDeletingProfile(profile_dir, last_used_profile_path);
     return;
@@ -1563,8 +1565,8 @@ ProfileManager::ProfileInfo* ProfileManager::RegisterProfile(
 
 ProfileManager::ProfileInfo* ProfileManager::GetProfileInfoByPath(
     const base::FilePath& path) const {
-  auto iter = profiles_info_.find(path);
-  return (iter == profiles_info_.end()) ? NULL : iter->second.get();
+  auto it = profiles_info_.find(path);
+  return it != profiles_info_.end() ? it->second.get() : nullptr;
 }
 
 void ProfileManager::AddProfileToStorage(Profile* profile) {

chrome/browser/profiles/profile_manager.h

@@ -36,9 +36,9 @@ class ProfileManagerObserver;
 class ProfileManager : public content::NotificationObserver,
                        public Profile::Delegate {
  public:
-  typedef base::RepeatingCallback<void(Profile*, Profile::CreateStatus)>
-      CreateCallback;
-  typedef base::OnceCallback<void(Profile*)> ProfileLoadedCallback;
+  using CreateCallback =
+      base::RepeatingCallback<void(Profile*, Profile::CreateStatus)>;
+  using ProfileLoadedCallback = base::OnceCallback<void(Profile*)>;
 
   explicit ProfileManager(const base::FilePath& user_data_dir);
   ~ProfileManager() override;
@@ -254,7 +254,8 @@ class ProfileManager : public content::NotificationObserver,
   // Creates a new profile by calling into the profile's profile creation
   // method. Virtual so that unittests can return a TestingProfile instead
   // of the Profile's result. Returns null if creation fails.
-  virtual Profile* CreateProfileHelper(const base::FilePath& path);
+  virtual std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path);
 
   // Creates a new profile asynchronously by calling into the profile's
   // asynchronous profile creation method. Virtual so that unittests can return

chrome/browser/profiles/profile_manager_unittest.cc

@@ -89,12 +89,11 @@ class UnittestProfileManager : public ProfileManagerWithoutInit {
   ~UnittestProfileManager() override = default;
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
-    if (!base::PathExists(file_path)) {
-      if (!base::CreateDirectory(file_path))
-        return nullptr;
-    }
-    return new TestingProfile(file_path, nullptr);
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    if (!base::PathExists(path) && !base::CreateDirectory(path))
+      return nullptr;
+    return std::make_unique<TestingProfile>(path);
   }
 
   std::unique_ptr<Profile> CreateProfileAsyncHelper(
@@ -579,12 +578,12 @@ class UnittestGuestProfileManager : public UnittestProfileManager {
       : UnittestProfileManager(user_data_dir) {}
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
     TestingProfile::Builder builder;
     builder.SetGuestSession();
-    builder.SetPath(file_path);
-    TestingProfile* testing_profile = builder.Build().release();
-    return testing_profile;
+    builder.SetPath(path);
+    return builder.Build();
   }
 };
 

chrome/browser/ui/startup/startup_browser_policy_unittest.cc

@@ -27,12 +27,11 @@ class UnittestProfileManager : public ProfileManagerWithoutInit {
   ~UnittestProfileManager() override = default;
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
-    if (!base::PathExists(file_path)) {
-      if (!base::CreateDirectory(file_path))
-        return nullptr;
-    }
-    return new TestingProfile(file_path, nullptr);
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    if (!base::PathExists(path) && !base::CreateDirectory(path))
+      return nullptr;
+    return std::make_unique<TestingProfile>(path);
   }
 
   std::unique_ptr<Profile> CreateProfileAsyncHelper(

chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc

@@ -101,10 +101,11 @@ class UnittestProfileManager : public ProfileManagerWithoutInit {
       : ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
-    if (!base::PathExists(file_path) && !base::CreateDirectory(file_path))
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    if (!base::PathExists(path) && !base::CreateDirectory(path))
       return nullptr;
-    return BuildTestingProfile(file_path, /*delegate=*/nullptr).release();
+    return BuildTestingProfile(path, /*delegate=*/nullptr);
   }
 
   std::unique_ptr<Profile> CreateProfileAsyncHelper(

chrome/test/base/testing_profile_manager.cc

@@ -36,8 +36,9 @@ class ProfileManager : public ::ProfileManagerWithoutInit {
       : ::ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
-  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
-    return new TestingProfile(file_path);
+  std::unique_ptr<Profile> CreateProfileHelper(
+      const base::FilePath& path) override {
+    return std::make_unique<TestingProfile>(path);
   }
 };