Do not delete sub key if main key was not found in ChromeTestLauncherDelegate::PreSharding()

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"
@@ skipping 98 matching lines @@
 #if defined(OS_WIN)
   // 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;
+  if (result != ERROR_SUCCESS) {
+    LOG_IF(ERROR, result != ERROR_FILE_NOT_FOUND)
+        << "Failed to open distribution key for cleanup: " << result;
     return;
   }
 
   result = distrubution_key.DeleteKey(L"PreferenceMACs");
-
-  if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
-    LOG(ERROR) << "Failed to cleanup PreferenceMACs: " << result;
-    return;
-  }
+  LOG_IF(ERROR, result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND)
+      << "Failed to cleanup PreferenceMACs: " << result;
 #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);
 }