diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 15:50:49 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 15:50:49 +0000 |
| commit | 162ac0f02a2a7a6f1909a85a222ab5da3d280d12 (patch) | |
| tree | ccc49648b2197f598acaeafa4d4f58c0c0048bdd /ceee/testing | |
| parent | ce833284bfd1b0a5db62e0f3c25f48af70ae8784 (diff) | |
| download | chromium_src-162ac0f02a2a7a6f1909a85a222ab5da3d280d12.zip chromium_src-162ac0f02a2a7a6f1909a85a222ab5da3d280d12.tar.gz chromium_src-162ac0f02a2a7a6f1909a85a222ab5da3d280d12.tar.bz2 | |
Integrate ETW with VLOG logging.
This change extends the log severities into the negative for VLOG verbosities.
It also keeps track of file/line information and passes it to any registered log handler.
The log level is naturally controlled by translating ETW log levels to the severities.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4164011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/testing')
| -rw-r--r-- | ceee/testing/utils/test_utils.cc | 5 | ||||
| -rw-r--r-- | ceee/testing/utils/test_utils.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ceee/testing/utils/test_utils.cc b/ceee/testing/utils/test_utils.cc index 48e522a..c55588d 100644 --- a/ceee/testing/utils/test_utils.cc +++ b/ceee/testing/utils/test_utils.cc @@ -57,8 +57,9 @@ HRESULT GetConnectionCount(IUnknown* container, return E_UNEXPECTED; } - -bool LogDisabler::DropMessageHandler(int severity, const std::string& str) { +bool LogDisabler::DropMessageHandler(int severity, const char* file, int line, + size_t message_start, const std::string& str) { + // Message is handled, no further processing. return true; } diff --git a/ceee/testing/utils/test_utils.h b/ceee/testing/utils/test_utils.h index 55582be..a51ca63 100644 --- a/ceee/testing/utils/test_utils.h +++ b/ceee/testing/utils/test_utils.h @@ -68,7 +68,8 @@ class LogDisabler { private: logging::LogMessageHandlerFunction old_handler_; - static bool DropMessageHandler(int severity, const std::string& str); + static bool DropMessageHandler(int severity, const char* file, int line, + size_t message_start, const std::string& str); }; // Overrides a path in the PathService singleton, replacing the |