Merge changes I84e09d29,I75f55f6c,I67077a96,I9f65a29f,I457a460c, ... …

…into main

* changes:
  tracing_integration_test: Remove WaitForTraceWritersChanged
  tracing_service_impl_unittest: Remove WaitForTraceWritersChanged
  tracing_service_impl_unittest: Do not access internal triggers
  tracing_service_impl_unittest: Rework marker test
  tracing_service_impl_unittest: Do not access internals in clone test
  tracing_service_impl_unittest: Don't check for internal ds state
  tracing_service_impl_unittest: Do not test number of pending flushes

src/tracing/service/tracing_service_impl.cc

@@ -112,6 +112,7 @@ namespace {
 constexpr int kMaxBuffersPerConsumer = 128;
 constexpr uint32_t kDefaultSnapshotsIntervalMs = 10 * 1000;
 constexpr int kDefaultWriteIntoFilePeriodMs = 5000;
+constexpr int kMinWriteIntoFilePeriodMs = 100;
 constexpr uint32_t kAllDataSourceStartedTimeout = 20000;
 constexpr int kMaxConcurrentTracingSessions = 15;
 constexpr int kMaxConcurrentTracingSessionsPerUid = 5;
@@ -975,8 +976,8 @@ base::Status TracingServiceImpl::EnableTracing(ConsumerEndpointImpl* consumer,
     uint32_t write_period_ms = cfg.file_write_period_ms();
     if (write_period_ms == 0)
       write_period_ms = kDefaultWriteIntoFilePeriodMs;
-    if (write_period_ms < min_write_period_ms_)
-      write_period_ms = min_write_period_ms_;
+    if (write_period_ms < kMinWriteIntoFilePeriodMs)
+      write_period_ms = kMinWriteIntoFilePeriodMs;
     tracing_session->write_period_ms = write_period_ms;
     tracing_session->max_file_size_bytes = cfg.max_file_size_bytes();
     tracing_session->bytes_written_into_file = 0;

src/tracing/service/tracing_service_impl.h

@@ -913,7 +913,6 @@ class TracingServiceImpl : public TracingService {
 
   bool smb_scraping_enabled_ = false;
   bool lockdown_mode_ = false;
-  uint32_t min_write_period_ms_ = 100;       // Overridable for testing.
   int64_t trigger_window_ns_ = kOneDayInNs;  // Overridable for testing.
 
   std::minstd_rand trigger_probability_rand_;