| Index: base/debug/trace_event_unittest.cc
|
| diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
|
| index 581906b72e1d43e55a805210c57f6841cf90afa4..92328926d2835473f73e6f2701a07cb6724d4ed5 100644
|
| --- a/base/debug/trace_event_unittest.cc
|
| +++ b/base/debug/trace_event_unittest.cc
|
| @@ -898,6 +898,7 @@ class MockEnabledStateChangedObserver :
|
| public:
|
| MOCK_METHOD0(OnTraceLogEnabled, void());
|
| MOCK_METHOD0(OnTraceLogDisabled, void());
|
| + MOCK_METHOD0(OnBeforeTraceLogDisabled, void());
|
| };
|
|
|
| TEST_F(TraceEventTestFixture, EnabledObserverFiresOnEnable) {
|
| @@ -931,6 +932,8 @@ TEST_F(TraceEventTestFixture, EnabledObserverDoesntFireOnSecondEnable) {
|
| .Times(0);
|
| EXPECT_CALL(observer, OnTraceLogDisabled())
|
| .Times(0);
|
| + EXPECT_CALL(observer, OnBeforeTraceLogDisabled())
|
| + .Times(0);
|
| TraceLog::GetInstance()->SetEnabled(
|
| CategoryFilter("*"),
|
| TraceLog::RECORDING_MODE,
|
| @@ -962,6 +965,8 @@ TEST_F(TraceEventTestFixture, EnabledObserverFiresOnFirstDisable) {
|
| .Times(0);
|
| EXPECT_CALL(observer, OnTraceLogDisabled())
|
| .Times(1);
|
| + EXPECT_CALL(observer, OnBeforeTraceLogDisabled())
|
| + .Times(1);
|
| TraceLog::GetInstance()->SetDisabled();
|
| testing::Mock::VerifyAndClear(&observer);
|
|
|
| @@ -981,6 +986,8 @@ TEST_F(TraceEventTestFixture, EnabledObserverFiresOnDisable) {
|
|
|
| EXPECT_CALL(observer, OnTraceLogDisabled())
|
| .Times(1);
|
| + EXPECT_CALL(observer, OnBeforeTraceLogDisabled())
|
| + .Times(1);
|
| TraceLog::GetInstance()->SetDisabled();
|
| testing::Mock::VerifyAndClear(&observer);
|
|
|
| @@ -1003,6 +1010,10 @@ class AfterStateChangeEnabledStateObserver
|
| virtual void OnTraceLogDisabled() OVERRIDE {
|
| EXPECT_FALSE(TraceLog::GetInstance()->IsEnabled());
|
| }
|
| +
|
| + virtual void OnBeforeTraceLogDisabled() OVERRIDE {
|
| + EXPECT_TRUE(TraceLog::GetInstance()->IsEnabled());
|
| + }
|
| };
|
|
|
| TEST_F(TraceEventTestFixture, ObserversFireAfterStateChange) {
|
|
|