Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Unified Diff: chrome/test/base/chrome_test_launcher.cc

Issue 2919523002: Do not delete sub key if main key was not found in ChromeTestLauncherDelegate::PreSharding() (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/chrome_test_launcher.cc
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index 8ba431f05a8ead3c21cc473f4d9afaa6ae07b944..4257986cb432d563a8ec4b8ba6bd19a9820d8d19 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -116,17 +116,15 @@ void ChromeTestLauncherDelegate::PreSharding() {
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
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698