Revert of Attempt #3 at registry outage: ShellExecute reg delete

chrome/test/base/chrome_test_launcher.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/test/base/chrome_test_launcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/process/process_metrics.h"
 #include "base/run_loop.h"
-#include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/test/test_file_util.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/install_static/test/scoped_install_details.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #include "components/crash/content/app/crashpad.h"
 #include "content/public/app/content_main.h"
@@ skipping 16 matching lines @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/test/ui_controls_factory_ash.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 #include "chrome/app/chrome_crash_reporter_client.h"
 #endif
 
 #if defined(OS_WIN)
-#include <shellapi.h>
 #include "base/win/registry.h"
 #include "chrome/app/chrome_crash_reporter_client_win.h"
 #include "chrome/install_static/install_util.h"
 #endif
 
 ChromeTestSuiteRunner::ChromeTestSuiteRunner() {}
 ChromeTestSuiteRunner::~ChromeTestSuiteRunner() {}
 
 int ChromeTestSuiteRunner::RunTestSuite(int argc, char** argv) {
   return ChromeTestSuite(argc, argv).Run();
@@ skipping 28 matching lines @@
   return true;
 }
 
 content::ContentMainDelegate*
 ChromeTestLauncherDelegate::CreateContentMainDelegate() {
   return new ChromeMainDelegate();
 }
 
 void ChromeTestLauncherDelegate::PreSharding() {
 #if defined(OS_WIN)
-  // Construct the distribution specific equivalent of
-  // "delete HKCU\\SOFTWARE\\Chromium\\PreferenceMACs /f".
-  base::string16 operation(L"delete HKCU\\");
-  operation.append(install_static::GetRegistryPath());
-  operation.append(L"\\PreferenceMACs /f");
-  // TODO(gab): This is a nuclear option while the cleanup below doesn't work as
-  // the bots are in such bad shape per https://crbug.com/721245 that doing any
-  // registry operations from C++ results in fatal error 1450 (insufficient
-  // resources). Hopefully ShellExecute works...
-  ::ShellExecute(NULL, NULL, L"reg.exe", operation.c_str(), NULL, 0);
+  // Pre-test cleanup for registry state keyed off the profile dir (which can
+  // proliferate with the use of uniquely named scoped_dirs):
+  // https://crbug.com/721245. This needs to be here in order not to be racy
+  // with any tests that will access that state.
+  base::win::RegKey distrubution_key;
+  LONG result = distrubution_key.Open(HKEY_CURRENT_USER,
+                                      install_static::GetRegistryPath().c_str(),
+                                      KEY_SET_VALUE);
 
-// // Pre-test cleanup for registry state keyed off the profile dir (which can
-// // proliferate with the use of uniquely named scoped_dirs):
-// // https://crbug.com/721245. This needs to be here in order not to be racy
-// // with any tests that will access that state.
-// base::win::RegKey distrubution_key;
-// LONG result = distrubution_key.Open(
-//     HKEY_CURRENT_USER, install_static::GetRegistryPath().c_str(),
-//     KEY_SET_VALUE);
+  if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
+    LOG(ERROR) << "Failed to open distribution key for cleanup: " << result;
+    return;
+  }
 
-// if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
-//   LOG(ERROR) << "Failed to open distribution key for cleanup: " << result;
-//   return;
-// }
+  result = distrubution_key.DeleteKey(L"PreferenceMACs");
 
-// result = distrubution_key.DeleteKey(L"PreferenceMACs");
-
-// if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
-//   LOG(ERROR) << "Failed to cleanup PreferenceMACs: " << result;
-//   return;
-// }
+  if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
+    LOG(ERROR) << "Failed to cleanup PreferenceMACs: " << result;
+    return;
+  }
 #endif
 }
 
 int LaunchChromeTests(int default_jobs,
                       content::TestLauncherDelegate* delegate,
                       int argc,
                       char** argv) {
 #if defined(OS_MACOSX)
   chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
 
 #if defined(OS_WIN)
   // Create a primordial InstallDetails instance for the test.
   install_static::ScopedInstallDetails install_details;
 #endif
 
 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
   // We leak this pointer intentionally. The crash client needs to outlive
   // all other code.
   ChromeCrashReporterClient* crash_client = new ChromeCrashReporterClient();
   ANNOTATE_LEAKING_OBJECT_PTR(crash_client);
   crash_reporter::SetCrashReporterClient(crash_client);
 #endif
 
   return content::LaunchTests(delegate, default_jobs, argc, argv);
 }