Revert 62766 - Fix event tracing for windows test flakyness.

Assert on non-null properties to the static members of the trace controller.
Fix usage of same.
Add a PostEventsDisabled method to trace producer to which allows for a non-racy enable/disable test.

BUG=52388
BUG=59328
TEST=Unittests in the change.

Review URL: http://codereview.chromium.org/3800006

TBR=siggi@chromium.org
Review URL: http://codereview.chromium.org/3815008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62767 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/base/event_trace_consumer_win_unittest.cc b/base/event_trace_consumer_win_unittest.cc
index c964412..6c0a740 100644
--- a/base/event_trace_consumer_win_unittest.cc
+++ b/base/event_trace_consumer_win_unittest.cc
@@ -72,8 +72,7 @@ const wchar_t* const kTestSessionName = L"TestLogSession";
 class EtwTraceConsumerBaseTest: public testing::Test {
  public:
   virtual void SetUp() {
-    EtwTraceProperties ignore;
-    EtwTraceController::Stop(kTestSessionName, &ignore);
+    EtwTraceController::Stop(kTestSessionName, NULL);
   }
 };
 
@@ -246,16 +245,14 @@ class EtwTraceConsumerDataTest: public testing::Test {
   }
 
   virtual void SetUp() {
-    EtwTraceProperties prop;
-    EtwTraceController::Stop(kTestSessionName, &prop);
+    EtwTraceController::Stop(kTestSessionName, NULL);
     // Construct a temp file name.
     ASSERT_TRUE(file_util::CreateTemporaryFile(&temp_file_));
   }
 
   virtual void TearDown() {
     EXPECT_TRUE(file_util::Delete(temp_file_, false));
-    EtwTraceProperties ignore;
-    EtwTraceController::Stop(kTestSessionName, &ignore);
+    EtwTraceController::Stop(kTestSessionName, NULL);
   }
 
   HRESULT LogEventToTempSession(PEVENT_TRACE_HEADER header) {