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

Unified Diff: trunk/src/chrome/browser/chrome_elf_init_win.cc

Issue 132043005: Revert 243967 "Use a Finch Experiment to control the Browser Bla..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 | « trunk/src/chrome/browser/chrome_elf_init_win.h ('k') | trunk/src/chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chrome_elf_init_win.cc
===================================================================
--- trunk/src/chrome/browser/chrome_elf_init_win.cc (revision 244024)
+++ trunk/src/chrome/browser/chrome_elf_init_win.cc (working copy)
@@ -1,103 +0,0 @@
-// 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/metrics/field_trial.h"
-#include "base/metrics/histogram.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/win/registry.h"
-#include "chrome/browser/chrome_elf_init_win.h"
-#include "chrome_elf/blacklist/blacklist.h"
-#include "version.h" // NOLINT
-
-namespace {
-
-const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
-const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
-
-// This enum is used to define the buckets for an enumerated UMA histogram.
-// Hence,
-// (a) existing enumerated constants should never be deleted or reordered, and
-// (b) new constants should only be appended in front of
-// BLACKLIST_SETUP_EVENT_MAX.
-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,
-
- // Always keep this at the end.
- BLACKLIST_SETUP_EVENT_MAX,
-};
-
-void RecordBlacklistSetupEvent(BlacklistSetupEventType blacklist_setup_event) {
- UMA_HISTOGRAM_ENUMERATION("Blacklist.Setup",
- blacklist_setup_event,
- BLACKLIST_SETUP_EVENT_MAX);
-}
-
-} // namespace
-
-void InitializeChromeElf() {
- if (base::FieldTrialList::FindFullName(kBrowserBlacklistTrialName) ==
- kBrowserBlacklistTrialEnabledGroupName) {
- BrowserBlacklistBeaconSetup();
- } else {
- // Disable the blacklist for all future runs by removing the beacon.
- base::win::RegKey blacklist_registry_key(HKEY_CURRENT_USER);
- blacklist_registry_key.DeleteKey(blacklist::kRegistryBeaconPath);
- }
-}
-
-void BrowserBlacklistBeaconSetup() {
- base::win::RegKey blacklist_registry_key(HKEY_CURRENT_USER,
- blacklist::kRegistryBeaconPath,
- KEY_QUERY_VALUE | KEY_SET_VALUE);
-
- // Find the last recorded blacklist version.
- base::string16 blacklist_version;
- blacklist_registry_key.ReadValue(blacklist::kBeaconVersion,
- &blacklist_version);
-
- if (blacklist_version != TEXT(CHROME_VERSION_STRING)) {
- // The blacklist hasn't run for this version yet, so enable it.
- LONG set_version = blacklist_registry_key.WriteValue(
- blacklist::kBeaconVersion,
- TEXT(CHROME_VERSION_STRING));
-
- LONG set_state = blacklist_registry_key.WriteValue(
- blacklist::kBeaconState,
- blacklist::BLACKLIST_ENABLED);
-
- // 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);
-
- // Don't try to record if the blacklist setup succeeded or failed in the
- // run since it could have been from either this version or the previous
- // version (since crashes occur before we set the version in the registry).
- } else {
- // The blacklist version didn't change, so record the results of the
- // latest setup.
- DWORD blacklist_state = blacklist::BLACKLIST_STATE_MAX;
- blacklist_registry_key.ReadValueDW(blacklist::kBeaconState,
- &blacklist_state);
-
- // Record the results of the latest blacklist setup.
- if (blacklist_state == blacklist::BLACKLIST_ENABLED) {
- RecordBlacklistSetupEvent(BLACKLIST_SETUP_RAN_SUCCESSFULLY);
- } else if (blacklist_state == blacklist::BLACKLIST_SETUP_RUNNING) {
- RecordBlacklistSetupEvent(BLACKLIST_SETUP_FAILED);
-
- // Since the setup failed, mark the blacklist as disabled so we don't
- // try it again for this version.
- blacklist_registry_key.WriteValue(blacklist::kBeaconState,
- blacklist::BLACKLIST_DISABLED);
- }
- }
-}
« no previous file with comments | « trunk/src/chrome/browser/chrome_elf_init_win.h ('k') | trunk/src/chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698