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

chrome/browser/downgrade/user_data_downgrade.cc

 // Copyright 2016 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/downgrade/user_data_downgrade.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "content/public/browser/browser_thread.h"
 
 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() {
   base::FilePath disk_cache_dir;
   policy::path_parser::CheckDiskCacheDirPolicy(&disk_cache_dir);
   if (disk_cache_dir.empty()) {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     disk_cache_dir = command_line->GetSwitchValuePath(switches::kDiskCacheDir);
   }
   if (disk_cache_dir.ReferencesParent())
@@ skipping 119 matching lines @@
     return base::Version(
         base::TrimWhitespaceASCII(last_version_str, base::TRIM_ALL)
             .as_string());
   }
   return base::Version();
 }
 
 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() {
   InstallLevel install_level = GetInstallLevel();
   base::win::RegKey key;
   DWORD is_msi = 3;
   return install_level != UNKNOWN &&
          key.Open((install_level == SYSTEM_INSTALL) ? HKEY_LOCAL_MACHINE
                                                     : HKEY_CURRENT_USER,
                   BrowserDistribution::GetDistribution()->GetStateKey().c_str(),
                   KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS &&
          key.ReadValueDW(google_update::kRegMSIField, &is_msi) ==
              ERROR_SUCCESS &&
          is_msi != 0;
 }
 
-void SetSimulateDowngradeForTest(bool is_browser_test) {
-  g_is_browser_test = is_browser_test;
-}
-
 }  // namespace downgrade