Can now adjust the number of retries before the blacklist is disabled.

chrome_elf/blacklist/blacklist.h

Index: chrome_elf/blacklist/blacklist.h
diff --git a/chrome_elf/blacklist/blacklist.h b/chrome_elf/blacklist/blacklist.h
index 9877c2930cc02ad2319e86824635f5d609aa69bb..1eb159a2791dbcdc3d3b1427eea813e40e53c676 100644
--- a/chrome_elf/blacklist/blacklist.h
+++ b/chrome_elf/blacklist/blacklist.h
@@ -21,16 +21,20 @@ extern const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount];
 extern NtMapViewOfSectionFunction g_nt_map_view_of_section_func;
 #endif
 
-// Attempts to leave a beacon in the current user's registry hive.
-// If the blacklist beacon doesn't say it is enabled or there are any other
-// errors when creating the beacon, returns false. Otherwise returns true.
-// The intent of the beacon is to act as an extra failure mode protection
-// whereby if Chrome for some reason fails to start during blacklist setup,
-// it will skip blacklisting on the subsequent run.
+// Helper for LeaveSetupBeacon. Checks the current state of the beacon and
+// modifies the beacon and attempt counter accordingly.
+bool HandlePreviousBeacon();

[csharp, 2014/06/11 13:34:43]

This probably doesn't need to be declared here since it is just local helper
function.

[krstnmnlsn, 2014/06/11 16:35:27]

Done.

+
+// Attempts to leave a beacon in the current user's registry hive. If the
+// blacklist beacon doesn't say it is enabled or there are any other errors when
+// creating the beacon, returns false. Otherwise returns true. The intent of the
+// beacon is to act as an extra failure mode protection whereby if Chrome for

[csharp, 2014/06/11 13:34:43]

nit: remove "for some reason"

[krstnmnlsn, 2014/06/11 16:35:27]

Done.

+// some reason repeatedly fails to start during blacklist setup, it will skip
+// blacklisting on the subsequent run.
 bool LeaveSetupBeacon();
 
-// Looks for the beacon that LeaveSetupBeacon() creates and resets it to
-// to show the setup was successful.
+// Looks for the setup running beacon that LeaveSetupBeacon() creates and resets
+// it to to show the setup was successful.
 // Returns true if the beacon was successfully set to BLACKLIST_ENABLED.
 bool ResetBeacon();