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

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 1756 matching lines @@
   // main message loop.
   std::vector<Profile*> last_opened_profiles;
 #if !defined(OS_CHROMEOS)
   // On ChromeOS multiple profiles doesn't apply, and will break if we load
   // them this early as the cryptohome hasn't yet been mounted (which happens
   // only once we log in).
   last_opened_profiles =
       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);
 
   // This step is costly and is already measured in
   // Startup.StartupBrowserCreator_Start.
   const bool started = browser_creator_->Start(
       parsed_command_line(), base::FilePath(), profile_, last_opened_profiles);
   const base::TimeTicks start_time_step3 = base::TimeTicks::Now();
   if (started) {
 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
@@ skipping 50 matching lines @@
   process_power_collector_->Initialize();
 #endif  // !defined(OS_ANDROID)
 
   PostBrowserStart();
 
   if (parameters().ui_task) {
     parameters().ui_task->Run();
     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
   // the start of the main loop.
   if (result_code_ <= 0) {
     RecordBrowserStartupTime();
   }
 #endif  // defined(OS_ANDROID)
 
 #if !defined(OS_ANDROID)
@@ skipping 127 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }