diff options
| author | nednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 05:49:00 +0000 |
|---|---|---|
| committer | nednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 05:49:00 +0000 |
| commit | dee939257029fa521576f8372619cf80b1786d98 (patch) | |
| tree | fd4f5c55b35942b788a4210499cd406db1d16550 /base/debug | |
| parent | 589fdd618386f6ee04f7a1fd8b14f6db7e44a18e (diff) | |
| download | chromium_src-dee939257029fa521576f8372619cf80b1786d98.zip chromium_src-dee939257029fa521576f8372619cf80b1786d98.tar.gz chromium_src-dee939257029fa521576f8372619cf80b1786d98.tar.bz2 | |
Reenable trace_event_unittest for windows
BUG=396403
Review URL: https://codereview.chromium.org/432473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/trace_event_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc index 566a65e..cc67a51 100644 --- a/base/debug/trace_event_unittest.cc +++ b/base/debug/trace_event_unittest.cc @@ -2439,13 +2439,7 @@ TEST_F(TraceEventCallbackTest, TraceEventCallbackAndRecordingDuration) { VerifyCollectedEvent(5, TRACE_EVENT_PHASE_END, "callback", "duration1"); } -#if defined(OS_WIN) -// http://crbug.com/396403 -#define MAYBE_TraceBufferVectorReportFull DISABLED_TraceBufferVectorReportFull -#else -#define MAYBE_TraceBufferVectorReportFull TraceBufferVectorReportFull -#endif -TEST_F(TraceEventTestFixture, MAYBE_TraceBufferVectorReportFull) { +TEST_F(TraceEventTestFixture, TraceBufferVectorReportFull) { TraceLog* trace_log = TraceLog::GetInstance(); trace_log->SetEnabled(CategoryFilter("*"), TraceLog::RECORDING_MODE, |