Revert 226701 "Implement TracingController::{Enable,Disable,Capt..."

Added test base_unittests:TraceContinuousSampling fails on main waterfall

http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Clang%20%28dbg%29&number=51008

TraceEventTestFixture.TraceContinuousSampling: 
../../base/debug/trace_event_unittest.cc:1814: Failure
Value of: FindNamePhase("CCC", "P")
Actual: false
Expected: true

> Implement TracingController::{Enable,Disable,Capture}Monitoring
> 
> This CL implements TracingController::EnableMonitoring,
> TracingController::DisableMonitoring and
> TracingController::CaptureMonitoringSnapshot.
> 
> BUG=241743
> TEST=base_unittests::TraceEventTestFixture.TraceContinuousSampling,
> content_browsertests::TracingControllerTest.EnableCaptureAndDisableMonitoring
> 
> Review URL: https://codereview.chromium.org/23531042

TBR=haraken@chromium.org

Review URL: https://codereview.chromium.org/25849002

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

1 files changed, 3 insertions, 90 deletions

diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc
index a3a589f..c88932e 100644
--- a/content/browser/tracing/tracing_controller_browsertest.cc
+++ b/content/browser/tracing/tracing_controller_browsertest.cc
@@ -20,9 +20,6 @@ class TracingControllerTest : public ContentBrowserTest {
     get_categories_done_callback_count_ = 0;
     enable_recording_done_callback_count_ = 0;
     disable_recording_done_callback_count_ = 0;
-    enable_monitoring_done_callback_count_ = 0;
-    disable_monitoring_done_callback_count_ = 0;
-    capture_monitoring_snapshot_done_callback_count_ = 0;
     ContentBrowserTest::SetUp();
   }
 
@@ -50,29 +47,6 @@ class TracingControllerTest : public ContentBrowserTest {
                                         scoped_ptr<base::FilePath> file_path) {
     disable_recording_done_callback_count_++;
     EXPECT_TRUE(PathExists(*file_path));
-    int64 file_size;
-    file_util::GetFileSize(*file_path, &file_size);
-    EXPECT_TRUE(file_size > 0);
-    quit_callback.Run();
-  }
-
-  void EnableMonitoringDoneCallbackTest(base::Closure quit_callback) {
-    enable_monitoring_done_callback_count_++;
-    quit_callback.Run();
-  }
-
-  void DisableMonitoringDoneCallbackTest(base::Closure quit_callback) {
-    disable_monitoring_done_callback_count_++;
-    quit_callback.Run();
-  }
-
-  void CaptureMonitoringSnapshotDoneCallbackTest(
-      base::Closure quit_callback, scoped_ptr<base::FilePath> file_path) {
-    capture_monitoring_snapshot_done_callback_count_++;
-    EXPECT_TRUE(PathExists(*file_path));
-    int64 file_size;
-    file_util::GetFileSize(*file_path, &file_size);
-    EXPECT_TRUE(file_size > 0);
     quit_callback.Run();
   }
 
@@ -88,25 +62,10 @@ class TracingControllerTest : public ContentBrowserTest {
     return disable_recording_done_callback_count_;
   }
 
-  int enable_monitoring_done_callback_count() const {
-    return enable_monitoring_done_callback_count_;
-  }
-
-  int disable_monitoring_done_callback_count() const {
-    return disable_monitoring_done_callback_count_;
-  }
-
-  int capture_monitoring_snapshot_done_callback_count() const {
-    return capture_monitoring_snapshot_done_callback_count_;
-  }
-
  private:
   int get_categories_done_callback_count_;
   int enable_recording_done_callback_count_;
   int disable_recording_done_callback_count_;
-  int enable_monitoring_done_callback_count_;
-  int disable_monitoring_done_callback_count_;
-  int capture_monitoring_snapshot_done_callback_count_;
 };
 
 IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) {
@@ -135,9 +94,8 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, EnableAndDisableRecording) {
         base::Bind(&TracingControllerTest::EnableRecordingDoneCallbackTest,
                    base::Unretained(this),
                    run_loop.QuitClosure());
-    bool result = controller->EnableRecording(base::debug::CategoryFilter("*"),
-        TracingController::Options(), callback);
-    EXPECT_TRUE(result);
+    controller->EnableRecording(base::debug::CategoryFilter("*"),
+                                TracingController::Options(), callback);
     run_loop.Run();
     EXPECT_EQ(enable_recording_done_callback_count(), 1);
   }
@@ -148,55 +106,10 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, EnableAndDisableRecording) {
         base::Bind(&TracingControllerTest::DisableRecordingDoneCallbackTest,
                    base::Unretained(this),
                    run_loop.QuitClosure());
-    bool result = controller->DisableRecording(callback);
-    EXPECT_TRUE(result);
+    controller->DisableRecording(callback);
     run_loop.Run();
     EXPECT_EQ(disable_recording_done_callback_count(), 1);
   }
 }
 
-IN_PROC_BROWSER_TEST_F(TracingControllerTest,
-                       EnableCaptureAndDisableMonitoring) {
-  Navigate(shell());
-
-  TracingController* controller = TracingController::GetInstance();
-
-  {
-    base::RunLoop run_loop;
-    TracingController::EnableMonitoringDoneCallback callback =
-        base::Bind(&TracingControllerTest::EnableMonitoringDoneCallbackTest,
-                   base::Unretained(this),
-                   run_loop.QuitClosure());
-    bool result = controller->EnableMonitoring(base::debug::CategoryFilter("*"),
-        TracingController::ENABLE_SAMPLING, callback);
-    EXPECT_TRUE(result);
-    run_loop.Run();
-    EXPECT_EQ(enable_monitoring_done_callback_count(), 1);
-  }
-
-  {
-    base::RunLoop run_loop;
-    TracingController::TracingFileResultCallback callback =
-        base::Bind(&TracingControllerTest::
-                       CaptureMonitoringSnapshotDoneCallbackTest,
-                   base::Unretained(this),
-                   run_loop.QuitClosure());
-    controller->CaptureMonitoringSnapshot(callback);
-    run_loop.Run();
-    EXPECT_EQ(capture_monitoring_snapshot_done_callback_count(), 1);
-  }
-
-  {
-    base::RunLoop run_loop;
-    TracingController::DisableMonitoringDoneCallback callback =
-        base::Bind(&TracingControllerTest::DisableMonitoringDoneCallbackTest,
-                   base::Unretained(this),
-                   run_loop.QuitClosure());
-    bool result = controller->DisableMonitoring(callback);
-    EXPECT_TRUE(result);
-    run_loop.Run();
-    EXPECT_EQ(disable_monitoring_done_callback_count(), 1);
-  }
-}
-
 }  // namespace content