summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 18:35:00 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 18:35:00 +0000
commit482fb8c3a29285a39d7cd11a54e2a83727330692 (patch)
treed2c18949ca946b4ebf250b7002776e15b571255d
parent259e60afebedebf2977e72dbec87ec13ffcb10fb (diff)
downloadchromium_src-482fb8c3a29285a39d7cd11a54e2a83727330692.zip
chromium_src-482fb8c3a29285a39d7cd11a54e2a83727330692.tar.gz
chromium_src-482fb8c3a29285a39d7cd11a54e2a83727330692.tar.bz2
Land http://codereview.chromium.org/5049001/ again (sigh)
Enable ETW logging in setup. BUG=none TEST=Should be no change Review URL: http://codereview.chromium.org/5017003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66299 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/util/logging_installer.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
index 33cf342..e2bcd54 100644
--- a/chrome/installer/util/logging_installer.cc
+++ b/chrome/installer/util/logging_installer.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/logging.h"
+#include "base/logging_win.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -16,6 +17,10 @@
#include "chrome/installer/util/master_preferences_constants.h"
#include "chrome/installer/util/util_constants.h"
+// {93BCE0BF-3FAF-43b1-9E28-BEB6FAB5ECE7}
+static const GUID kSetupTraceProvider = { 0x93bce0bf, 0x3faf, 0x43b1,
+ { 0x9e, 0x28, 0xbe, 0xb6, 0xfa, 0xb5, 0xec, 0xe7 } };
+
namespace installer {
// This should be true for the period between the end of
@@ -45,6 +50,9 @@ void InitInstallerLogging(const installer_util::MasterPreferences& prefs) {
logging::SetMinLogLevel(logging::LOG_ERROR);
}
+ // Enable ETW logging.
+ logging::LogEventProvider::Initialize(kSetupTraceProvider);
+
installer_logging_ = true;
}