Check if a deleted profile still exists before logging that it is still there

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
@@ skipping 871 matching lines @@
   DCHECK(deleted_profiles);
 
   for (const std::unique_ptr<base::Value>& value : *deleted_profiles) {
     base::FilePath profile_path;
     bool is_valid_profile_path =
         base::GetValueAsFilePath(*value, &profile_path) &&
         profile_path.DirName() == user_data_dir();
     // Although it should never happen, make sure this is a valid path in the
     // user_data_dir, so we don't accidentially delete something else.
     if (is_valid_profile_path) {
-      LOG(WARNING) << "Files of a deleted profile still exist after restart. "
-                      "Cleaning up now.";
-      BrowserThread::PostTaskAndReply(
-          BrowserThread::FILE, FROM_HERE,
-          base::Bind(&NukeProfileFromDisk, profile_path),
+      if (base::PathExists(profile_path)) {
+        LOG(WARNING) << "Files of a deleted profile still exist after restart. "
+                        "Cleaning up now.";
+        BrowserThread::PostTaskAndReply(
+            BrowserThread::FILE, FROM_HERE,
+            base::Bind(&NukeProfileFromDisk, profile_path),
+            base::Bind(&ProfileCleanedUp, value.get()));
+      } else {
+        // Everything is fine, the profile was removed on shutdown.
+        BrowserThread::PostTask(
+          BrowserThread::UI, FROM_HERE,
           base::Bind(&ProfileCleanedUp, value.get()));
+      }
     } else {
       LOG(ERROR) << "Found invalid profile path in deleted_profiles: "
                  << profile_path.AsUTF8Unsafe();
       NOTREACHED();
     }
   }
 }
 
 void ProfileManager::InitProfileUserPrefs(Profile* profile) {
   TRACE_EVENT0("browser", "ProfileManager::InitProfileUserPrefs");
@@ skipping 806 matching lines @@
 
   FinishDeletingProfile(profile_to_delete_path, new_active_profile_path);
   if (!original_callback.is_null())
     original_callback.Run(loaded_profile, status);
 }
 #endif  // !defined(OS_ANDROID)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }