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

chrome/browser/downgrade/user_data_downgrade.cc

Index: chrome/browser/downgrade/user_data_downgrade.cc
diff --git a/chrome/browser/downgrade/user_data_downgrade.cc b/chrome/browser/downgrade/user_data_downgrade.cc
index 17dabe7a97d51e0cf1ed73097a611bb20d3b600f..be1413b74a7527ed73ac890082722b5658120ff7 100644
--- a/chrome/browser/downgrade/user_data_downgrade.cc
+++ b/chrome/browser/downgrade/user_data_downgrade.cc
@@ -31,8 +31,6 @@ namespace downgrade {
 
 namespace {
 
-bool g_is_browser_test = false;
-
 // Return the disk cache dir override value if exists or empty path for default
 // disk cache dir.
 base::FilePath GetDiskCacheDir() {
@@ -172,18 +170,11 @@ base::Version GetLastVersion(const base::FilePath& user_data_dir) {
 void DeleteMovedUserDataSoon() {
   base::FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  if (g_is_browser_test) {
-    // Delete task will always be posted and executed for browser test.
-    content::BrowserThread::PostBlockingPoolTask(
-        FROM_HERE,
-        base::Bind(&DeleteMovedUserData, user_data_dir, GetDiskCacheDir()));
-  } else {
-    content::BrowserThread::PostAfterStartupTask(
-        FROM_HERE, content::BrowserThread::GetBlockingPool()
-                       ->GetTaskRunnerWithShutdownBehavior(
-                           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN),
-        base::Bind(&DeleteMovedUserData, user_data_dir, GetDiskCacheDir()));
-  }
+  content::BrowserThread::PostAfterStartupTask(
+      FROM_HERE, content::BrowserThread::GetBlockingPool()
+                     ->GetTaskRunnerWithShutdownBehavior(
+                         base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN),
+      base::Bind(&DeleteMovedUserData, user_data_dir, GetDiskCacheDir()));
 }
 
 bool IsMSIInstall() {
@@ -200,8 +191,4 @@ bool IsMSIInstall() {
          is_msi != 0;
 }
 
-void SetSimulateDowngradeForTest(bool is_browser_test) {
-  g_is_browser_test = is_browser_test;
-}
-
 }  // namespace downgrade