Reorder GenerateStateFromBeaconAndAttemptCount.

chrome_elf/blacklist/blacklist.cc

Index: chrome_elf/blacklist/blacklist.cc
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 824a9e95a87d54df9fcf2fe4bfb0a1e7840844a5..ac7204f34508c7116f337b91587041c64008a998 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -87,7 +87,13 @@ DWORD SetDWValue(HKEY* key, const wchar_t* property, DWORD value) {
 
 bool GenerateStateFromBeaconAndAttemptCount(HKEY* key, DWORD blacklist_state) {
   LONG result = 0;
-  if (blacklist_state == blacklist::BLACKLIST_SETUP_RUNNING) {

[robertshield, 2014/08/25 13:40:18]

previously, BLACKLIST_STATE_FAILED would hit this branch (and return false) as
well. Just double checking that the fact that it now doesn't and will return
true instead is intentional.

+  if (blacklist_state == blacklist::BLACKLIST_ENABLED) {
+    // If the blacklist succeeded on the previous run reset the failure
+    // counter.
+    return (SetDWValue(key,
+                       blacklist::kBeaconAttemptCount,
+                       static_cast<DWORD>(0)) == ERROR_SUCCESS);
+  } else {
     // Some part of the blacklist setup failed last time.  If this has occured
     // blacklist::kBeaconMaxAttempts times in a row we switch the state to
     // failed and skip setting up the blacklist.
@@ -111,18 +117,10 @@ bool GenerateStateFromBeaconAndAttemptCount(HKEY* key, DWORD blacklist_state) {
     if (attempt_count >= blacklist::kBeaconMaxAttempts) {
       blacklist_state = blacklist::BLACKLIST_SETUP_FAILED;
       SetDWValue(key, blacklist::kBeaconState, blacklist_state);
-      return false;
-    }
-  } else if (blacklist_state == blacklist::BLACKLIST_ENABLED) {
-    // If the blacklist succeeded on the previous run reset the failure
-    // counter.
-    result =
-        SetDWValue(key, blacklist::kBeaconAttemptCount, static_cast<DWORD>(0));
-    if (result != ERROR_SUCCESS) {
-      return false;
     }
+
+    return false;
   }
-  return true;
 }
 
 }  // namespace