Enable overlapping, usage counted SetEnabled()/SetDisabled() for TraceLog

base/debug/trace_event_unittest.cc

 // Copyright (c) 2012 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/debug/trace_event_unittest.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/json/json_reader.h"
@@ skipping 53 matching lines @@
     trace_parsed_.Clear();
     json_output_.json_output.clear();
   }
 
   void BeginTrace() {
     event_watch_notification_ = 0;
     TraceLog::GetInstance()->SetEnabled("*");
   }
 
   void EndTraceAndFlush() {
-    TraceLog::GetInstance()->SetDisabled();
+    while (TraceLog::GetInstance()->IsEnabled())
+      TraceLog::GetInstance()->SetDisabled();
     TraceLog::GetInstance()->Flush(
         base::Bind(&TraceEventTestFixture::OnTraceDataCollected,
                    base::Unretained(this)));
   }
 
   virtual void SetUp() OVERRIDE {
     old_thread_name_ = PlatformThread::GetName();
   }
   virtual void TearDown() OVERRIDE {
     if (TraceLog::GetInstance())
@@ skipping 604 matching lines @@
   EXPECT_CALL(observer, OnTraceLogWillEnable())
       .Times(0);
   EXPECT_CALL(observer, OnTraceLogWillDisable())
       .Times(0);
   TraceLog::GetInstance()->SetEnabled(true);
   testing::Mock::VerifyAndClear(&observer);
 
   // Cleanup.
   TraceLog::GetInstance()->RemoveEnabledStateObserver(&observer);
   TraceLog::GetInstance()->SetEnabled(false);
+  TraceLog::GetInstance()->SetEnabled(false);
 }
 
-TEST_F(TraceEventTestFixture, EnabledObserverDoesntFireOnUselessDisable) {
+TEST_F(TraceEventTestFixture, EnabledObserverDoesntFireOnNestedDisable) {
   ManualTestSetUp();
 
+  TraceLog::GetInstance()->SetEnabled(true);
+  TraceLog::GetInstance()->SetEnabled(true);
 
   testing::StrictMock<MockEnabledStateChangedObserver> observer;
   TraceLog::GetInstance()->AddEnabledStateObserver(&observer);
 
   EXPECT_CALL(observer, OnTraceLogWillEnable())
       .Times(0);
   EXPECT_CALL(observer, OnTraceLogWillDisable())
       .Times(0);
   TraceLog::GetInstance()->SetEnabled(false);
   testing::Mock::VerifyAndClear(&observer);
 
   // Cleanup.
   TraceLog::GetInstance()->RemoveEnabledStateObserver(&observer);
+  TraceLog::GetInstance()->SetEnabled(false);
 }
 
 TEST_F(TraceEventTestFixture, EnabledObserverFiresOnDisable) {
   ManualTestSetUp();
 
   TraceLog::GetInstance()->SetEnabled(true);
 
   MockEnabledStateChangedObserver observer;
   TraceLog::GetInstance()->AddEnabledStateObserver(&observer);
 
@@ skipping 603 matching lines @@
   EXPECT_STREQ(json_output_.json_output.c_str(), "[bla1,bla2,bla3,bla4]");
 
   Clear();
 
   trace_buffer_.Start();
   trace_buffer_.AddFragment("bla1,bla2,bla3,bla4");
   trace_buffer_.Finish();
   EXPECT_STREQ(json_output_.json_output.c_str(), "[bla1,bla2,bla3,bla4]");
 }
 
+TEST_F(TraceEventTestFixture, TraceEnableDisable) {
+  ManualTestSetUp();

[nduca, 2013/01/08 21:27:39]

How does enabling work with çategories? I think we should probably delete
SetEnabled(bool) and route everythign throughSetEnabed(included, excluded) and
then fix that one to support nesting?

+
+  TraceLog* trace_log = TraceLog::GetInstance();
+  trace_log->SetEnabled(std::string());
+  EXPECT_TRUE(trace_log->IsEnabled());
+  trace_log->SetDisabled();
+  EXPECT_FALSE(trace_log->IsEnabled());
+
+  trace_log->SetEnabled(true);
+  EXPECT_TRUE(trace_log->IsEnabled());
+  const std::vector<std::string> empty;
+  trace_log->SetEnabled(empty, empty);
+  EXPECT_TRUE(trace_log->IsEnabled());
+  trace_log->SetEnabled(false);
+  EXPECT_TRUE(trace_log->IsEnabled());
+  trace_log->SetDisabled();
+  EXPECT_FALSE(trace_log->IsEnabled());
+}
+
 }  // namespace debug
 }  // namespace base