Removes downgrade browser test hack and verifies renamed user data dir.

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 2c83ce93751d876dfe2e804842c2830593c9a3a5..d86da023b2893c426152156b8721e1bf18f82828 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1774,11 +1774,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
       g_browser_process->profile_manager()->GetLastOpenedProfiles();
 #endif  // defined(OS_CHROMEOS)
 
-#if defined(OS_WIN)
-  // Clean up old user data directory and disk cache directory.
-  downgrade::DeleteMovedUserDataSoon();
-#endif
-
   UMA_HISTOGRAM_TIMES("Startup.PreMainMessageLoopRunImplStep2Time",
                       base::TimeTicks::Now() - start_time_step2);
 
@@ -1849,6 +1844,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
     delete parameters().ui_task;
     run_message_loop_ = false;
   }
+
+#if defined(OS_WIN)
+  // Clean up old user data directory and disk cache directory.
+  downgrade::DeleteMovedUserDataSoon();
+#endif
+
 #if defined(OS_ANDROID)
   // We never run the C++ main loop on Android, since the UI thread message
   // loop is controlled by the OS, so this is as close as we can get to