Revert of Wait until a new profile has been created before deleting the active profile.

chrome/browser/profiles/profile_manager.h

Index: chrome/browser/profiles/profile_manager.h
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index 9436a459e1f58dcb7346727914f52ff74955cc51..ff28e3d1e6537440ad58ee5e5d2c92be1513dd34 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -265,10 +265,8 @@
   // creation and adds it to the set managed by this ProfileManager.
   Profile* CreateAndInitializeProfile(const base::FilePath& profile_dir);
 
-  // Schedules the profile at the given path to be deleted on shutdown,
-  // and marks the new profile as active.
-  void FinishDeletingProfile(const base::FilePath& profile_dir,
-                             const base::FilePath& new_active_profile_dir);
+  // Schedules the profile at the given path to be deleted on shutdown.
+  void FinishDeletingProfile(const base::FilePath& profile_dir);
 
   // Registers profile with given info. Returns pointer to created ProfileInfo
   // entry.
@@ -319,6 +317,7 @@
   };
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
+#if defined(OS_MACOSX)
   // If the |loaded_profile| has been loaded successfully (according to
   // |status|) and isn't already scheduled for deletion, then finishes adding
   // |profile_to_delete_dir| to the queue of profiles to be deleted, and updates
@@ -330,6 +329,7 @@
       const CreateCallback& original_callback,
       Profile* loaded_profile,
       Profile::CreateStatus status);
+#endif
 
   content::NotificationRegistrar registrar_;