Report when blacklist.cc fails to setup the blacklisting thunk.

chrome/browser/chrome_elf_init_win.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
@@ skipping 22 matching lines @@
 enum BlacklistSetupEventType {
   // The blacklist beacon has placed to enable the browser blacklisting.
   BLACKLIST_SETUP_ENABLED = 0,
 
   // The blacklist was successfully enabled.
   BLACKLIST_SETUP_RAN_SUCCESSFULLY,
 
   // The blacklist setup code failed to execute.
   BLACKLIST_SETUP_FAILED,
 
-  // Deprecated. The blacklist thunk setup code failed to execute.
+  // The blacklist thunk setup code failed. This is probably an indication
+  // that something else patched that code first.
   BLACKLIST_THUNK_SETUP_FAILED,
 
   // Deprecated. The blacklist interception code failed to execute.
   BLACKLIST_INTERCEPTION_FAILED,
 
   // The blacklist was disabled for this run (after it failed too many times).
   BLACKLIST_SETUP_DISABLED,
 
   // Always keep this at the end.
   BLACKLIST_SETUP_EVENT_MAX,
@@ skipping 82 matching lines @@
 
   // No point in trying to continue if the registry key isn't valid.
   if (!blacklist_registry_key.Valid())
     return;
 
   // Record the results of the last blacklist setup.
   DWORD blacklist_state = blacklist::BLACKLIST_STATE_MAX;
   blacklist_registry_key.ReadValueDW(blacklist::kBeaconState, &blacklist_state);
 
   if (blacklist_state == blacklist::BLACKLIST_ENABLED) {
-    // The blacklist was enabled successfully so we record the event (along with
-    // the number of failed previous attempts).
-    RecordBlacklistSetupEvent(BLACKLIST_SETUP_RAN_SUCCESSFULLY);
+    // The blacklist setup didn't crash, so we report if it was enabled or not.
+    if (blacklist::IsBlacklistInitialized()) {
+      RecordBlacklistSetupEvent(BLACKLIST_SETUP_RAN_SUCCESSFULLY);
+    } else {
+      // The only way for the blacklist to be enabled, but not fully
+      // initialized is if the thunk setup failed. See blacklist.cc

[krstnmnlsn, 2014/06/18 18:36:41]

I guess my comment on line 196 of blacklist.cc is slightly incorrect (and seems
to disagree with this comment), should we change it to something like "Reaching
this point with the setup running state means the setup code <did not crash>"?

[csharp, 2014/06/18 19:03:00]

Correct, I updated blacklist.cc

+      // for more details.
+      RecordBlacklistSetupEvent(BLACKLIST_THUNK_SETUP_FAILED);
+    }
+
+    // Regardless of if the blacklist was fully enabled or not, report how many
+    // times we had to try to set it up.
     DWORD attempt_count = 0;
     blacklist_registry_key.ReadValueDW(blacklist::kBeaconAttemptCount,
                                        &attempt_count);
     UMA_HISTOGRAM_COUNTS_100("Blacklist.RetryAttempts.Success", attempt_count);
   } else if (blacklist_state == blacklist::BLACKLIST_SETUP_FAILED) {
     // We can set the state to disabled without checking that the maximum number
     // of attempts was exceeded because blacklist.cc has already done this.
     RecordBlacklistSetupEvent(BLACKLIST_SETUP_FAILED);
     blacklist_registry_key.WriteValue(blacklist::kBeaconState,
                                       blacklist::BLACKLIST_DISABLED);
@@ skipping 19 matching lines @@
 
     blacklist_registry_key.WriteValue(blacklist::kBeaconAttemptCount,
                                       static_cast<DWORD>(0));
 
     // Only report the blacklist as getting setup when both registry writes
     // succeed, since otherwise the blacklist wasn't properly setup.
     if (set_version == ERROR_SUCCESS && set_state == ERROR_SUCCESS)
       RecordBlacklistSetupEvent(BLACKLIST_SETUP_ENABLED);
   }
 }