[code health] Make member variables private.

The member variables should be private, and can be accessed in
tests via protected accessors.

BUG=none
TBR=behdadb@chromium.org

Change-Id: I40e19a3d76323800df9b6c2aa45ad27efe1bc31a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149275Reviewed-by: Behdad Bakhshinategh <behdadb@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Behdad Bakhshinategh <behdadb@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Auto-Submit: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758864}

cc/metrics/compositor_frame_reporting_controller.cc

@@ -52,6 +52,11 @@ base::TimeTicks CompositorFrameReportingController::Now() const {
   return base::TimeTicks::Now();
 }
 
+bool CompositorFrameReportingController::HasReporterAt(
+    PipelineStage stage) const {
+  return !!reporters_[stage].get();
+}
+
 void CompositorFrameReportingController::WillBeginImplFrame(
     const viz::BeginFrameArgs& args) {
   base::TimeTicks begin_time = Now();

cc/metrics/compositor_frame_reporting_controller.h

@@ -74,7 +74,7 @@ class CC_EXPORT CompositorFrameReportingController {
   virtual void AddActiveTracker(FrameSequenceTrackerType type);
   virtual void RemoveActiveTracker(FrameSequenceTrackerType type);
 
-  base::flat_set<FrameSequenceTrackerType> active_trackers_;
+  std::unique_ptr<CompositorFrameReporter>* reporters() { return reporters_; }
 
  protected:
   struct SubmittedCompositorFrame {
@@ -87,8 +87,8 @@ class CC_EXPORT CompositorFrameReportingController {
     ~SubmittedCompositorFrame();
   };
   base::TimeTicks Now() const;
-  std::unique_ptr<CompositorFrameReporter>
-      reporters_[PipelineStage::kNumPipelineStages];
+
+  bool HasReporterAt(PipelineStage stage) const;
 
  private:
   void AdvanceReporterStage(PipelineStage start, PipelineStage target);
@@ -101,6 +101,7 @@ class CC_EXPORT CompositorFrameReportingController {
   viz::BeginFrameId last_submitted_frame_id_;
 
   bool next_activate_has_invalidation_ = false;
+  base::flat_set<FrameSequenceTrackerType> active_trackers_;
 
   // The latency reporter passed to each CompositorFrameReporter. Owned here
   // because it must be common among all reporters.
@@ -108,6 +109,9 @@ class CC_EXPORT CompositorFrameReportingController {
   // outlive the objects in |submitted_compositor_frames_|.
   std::unique_ptr<LatencyUkmReporter> latency_ukm_reporter_;
 
+  std::unique_ptr<CompositorFrameReporter>
+      reporters_[PipelineStage::kNumPipelineStages];
+
   // Mapping of frame token to pipeline reporter for submitted compositor
   // frames.
   // DO NOT reorder this line and the one above. The latency_ukm_reporter_ must

cc/metrics/compositor_frame_reporting_controller_unittest.cc

@@ -37,12 +37,10 @@ class TestCompositorFrameReportingController
   TestCompositorFrameReportingController& operator=(
       const TestCompositorFrameReportingController& controller) = delete;
 
-  std::unique_ptr<CompositorFrameReporter>* reporters() { return reporters_; }
-
   int ActiveReporters() {
     int count = 0;
     for (int i = 0; i < PipelineStage::kNumPipelineStages; ++i) {
-      if (reporters_[i])
+      if (reporters()[i])
         ++count;
     }
     return count;

cc/test/fake_compositor_frame_reporting_controller.cc

@@ -17,14 +17,14 @@ FakeCompositorFrameReportingController::FakeCompositorFrameReportingController()
 
 void FakeCompositorFrameReportingController::WillBeginMainFrame(
     const viz::BeginFrameArgs& args) {
-  if (!reporters_[PipelineStage::kBeginImplFrame])
+  if (!HasReporterAt(PipelineStage::kBeginImplFrame))
     CompositorFrameReportingController::WillBeginImplFrame(args);
   CompositorFrameReportingController::WillBeginMainFrame(args);
 }
 
 void FakeCompositorFrameReportingController::BeginMainFrameAborted(
     const viz::BeginFrameId& id) {
-  if (!reporters_[PipelineStage::kBeginMainFrame]) {
+  if (!HasReporterAt(PipelineStage::kBeginMainFrame)) {
     viz::BeginFrameArgs args = viz::BeginFrameArgs();
     args.frame_id = id;
     args.frame_time = Now();
@@ -35,7 +35,7 @@ void FakeCompositorFrameReportingController::BeginMainFrameAborted(
 }
 
 void FakeCompositorFrameReportingController::WillCommit() {
-  if (!reporters_[PipelineStage::kBeginMainFrame]) {
+  if (!HasReporterAt(PipelineStage::kBeginMainFrame)) {
     viz::BeginFrameArgs args = viz::BeginFrameArgs();
     args.frame_id = viz::BeginFrameId();
     args.frame_time = Now();
@@ -46,19 +46,19 @@ void FakeCompositorFrameReportingController::WillCommit() {
 }
 
 void FakeCompositorFrameReportingController::DidCommit() {
-  if (!reporters_[PipelineStage::kBeginMainFrame])
+  if (!HasReporterAt(PipelineStage::kBeginMainFrame))
     WillCommit();
   CompositorFrameReportingController::DidCommit();
 }
 
 void FakeCompositorFrameReportingController::WillActivate() {
-  if (!reporters_[PipelineStage::kCommit])
+  if (!HasReporterAt(PipelineStage::kCommit))
     DidCommit();
   CompositorFrameReportingController::WillActivate();
 }
 
 void FakeCompositorFrameReportingController::DidActivate() {
-  if (!reporters_[PipelineStage::kCommit])
+  if (!HasReporterAt(PipelineStage::kCommit))
     WillActivate();
   CompositorFrameReportingController::DidActivate();
 }