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

chrome_elf/blacklist/blacklist.h

 // Copyright 2013 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.
 
 #ifndef CHROME_ELF_BLACKLIST_BLACKLIST_H_
 #define CHROME_ELF_BLACKLIST_BLACKLIST_H_
 
 #if defined(_WIN64)
 #include "sandbox/win/src/sandbox_nt_types.h"
 #endif
 
 namespace blacklist {
 
 // Max size of the DLL blacklist.
 const size_t kTroublesomeDllsMaxCount = 64;
 
 // The DLL blacklist.
 extern const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount];
 
 #if defined(_WIN64)
 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();
 
 // Return the size of the current blacklist.
 int BlacklistSize();
 
 // Returns if true if the blacklist has been initialized.
 extern "C" bool IsBlacklistInitialized();
 
 // Adds the given dll name to the blacklist. Returns true if the dll name is in
@@ skipping 21 matching lines @@
 
 // Initializes the DLL blacklist in the current process. This should be called
 // before any undesirable DLLs might be loaded. If |force| is set to true, then
 // initialization will take place even if a beacon is present. This is useful
 // for tests.
 bool Initialize(bool force);
 
 }  // namespace blacklist
 
 #endif  // CHROME_ELF_BLACKLIST_BLACKLIST_H_