Make data members of test base class private

The data members were earlier marked protected when they were part of
a test fixture class defined in a .cc file. Now that they have been
moved to a .h file, it is preferred to mark them as private.

Bug: 1086430
Change-Id: I405115dd30330e7b4be90ce43c31eb06ee965b6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2421500
Commit-Queue: Saurabh Nijhara <snijhara@google.com>
Reviewed-by: Oleg Davydov <burunduk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809736}

chrome/browser/extensions/forced_extensions/force_installed_test_base.cc

@@ -11,7 +11,6 @@
 #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h"
 #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_profile.h"
 #include "components/policy/core/common/policy_service_impl.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
@@ -54,7 +53,8 @@ void ForceInstalledTestBase::SetUp() {
   prefs_ = profile_->GetTestingPrefService();
   registry_ = ExtensionRegistry::Get(profile_);
   install_stage_tracker_ = InstallStageTracker::Get(profile_);
-  tracker_ = std::make_unique<ForceInstalledTracker>(registry_, profile_);
+  force_installed_tracker_ =
+      std::make_unique<ForceInstalledTracker>(registry_, profile_);
 }
 
 void ForceInstalledTestBase::SetupForceList() {

chrome/browser/extensions/forced_extensions/force_installed_test_base.h

@@ -5,13 +5,12 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_FORCED_EXTENSIONS_FORCE_INSTALLED_TEST_BASE_H_
 #define CHROME_BROWSER_EXTENSIONS_FORCED_EXTENSIONS_FORCE_INSTALLED_TEST_BASE_H_
 
+#include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class TestingProfile;
-
 namespace sync_preferences {
 class TestingPrefServiceSyncable;
 }
@@ -44,6 +43,20 @@ class ForceInstalledTestBase : public testing::Test {
   // kInstallForceList preference.
   void SetupEmptyForceList();
 
+  Profile* profile() const { return profile_; }
+
+  sync_preferences::TestingPrefServiceSyncable* prefs() const { return prefs_; }
+
+  ExtensionRegistry* registry() const { return registry_; }
+
+  InstallStageTracker* install_stage_tracker() const {
+    return install_stage_tracker_;
+  }
+
+  ForceInstalledTracker* force_installed_tracker() const {
+    return force_installed_tracker_.get();
+  }
+
   static const char kExtensionId1[];
   static const char kExtensionId2[];
   static const char kExtensionName1[];
@@ -52,13 +65,15 @@ class ForceInstalledTestBase : public testing::Test {
 
   content::BrowserTaskEnvironment task_environment_{
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
+
+ private:
   policy::MockConfigurationPolicyProvider policy_provider_;
   std::unique_ptr<TestingProfileManager> profile_manager_;
   TestingProfile* profile_;
   sync_preferences::TestingPrefServiceSyncable* prefs_;
   ExtensionRegistry* registry_;
   InstallStageTracker* install_stage_tracker_;
-  std::unique_ptr<ForceInstalledTracker> tracker_;
+  std::unique_ptr<ForceInstalledTracker> force_installed_tracker_;
 };
 
 }  // namespace extensions

chrome/browser/extensions/forced_extensions/force_installed_tracker_unittest.cc

@@ -24,7 +24,7 @@ class ForceInstalledTrackerTest : public ForceInstalledTestBase,
 
   void SetUp() override {
     ForceInstalledTestBase::SetUp();
-    scoped_observer_.Add(tracker_.get());
+    scoped_observer_.Add(force_installed_tracker());
   }
 
   // ForceInstalledTracker::Observer overrides:
@@ -60,21 +60,21 @@ TEST_F(ForceInstalledTrackerTest, AllExtensionsInstalled) {
   auto ext2 = ExtensionBuilder(kExtensionName2).SetID(kExtensionId2).Build();
   EXPECT_FALSE(loaded_called_);
   EXPECT_FALSE(ready_called_);
-  EXPECT_FALSE(tracker_->IsDoneLoading());
+  EXPECT_FALSE(force_installed_tracker()->IsDoneLoading());
 
-  tracker_->OnExtensionLoaded(profile_, ext1.get());
-  tracker_->OnExtensionLoaded(profile_, ext2.get());
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext1.get());
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext2.get());
   EXPECT_TRUE(loaded_called_);
   EXPECT_FALSE(ready_called_);
-  EXPECT_TRUE(tracker_->IsDoneLoading());
-  EXPECT_FALSE(tracker_->IsReady());
+  EXPECT_TRUE(force_installed_tracker()->IsDoneLoading());
+  EXPECT_FALSE(force_installed_tracker()->IsReady());
 
-  tracker_->OnExtensionReady(profile_, ext1.get());
-  tracker_->OnExtensionReady(profile_, ext2.get());
+  force_installed_tracker()->OnExtensionReady(profile(), ext1.get());
+  force_installed_tracker()->OnExtensionReady(profile(), ext2.get());
   EXPECT_TRUE(loaded_called_);
   EXPECT_TRUE(ready_called_);
-  EXPECT_TRUE(tracker_->IsDoneLoading());
-  EXPECT_TRUE(tracker_->IsReady());
+  EXPECT_TRUE(force_installed_tracker()->IsDoneLoading());
+  EXPECT_TRUE(force_installed_tracker()->IsReady());
 }
 
 // This test verifies that OnForceInstalledExtensionsLoaded() is not called till
@@ -82,15 +82,15 @@ TEST_F(ForceInstalledTrackerTest, AllExtensionsInstalled) {
 TEST_F(ForceInstalledTrackerTest, ExtensionPendingInstall) {
   SetupForceList();
   auto ext1 = ExtensionBuilder(kExtensionName1).SetID(kExtensionId1).Build();
-  tracker_->OnExtensionLoaded(profile_, ext1.get());
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext1.get());
   EXPECT_FALSE(loaded_called_);
   EXPECT_FALSE(ready_called_);
-  EXPECT_FALSE(tracker_->IsDoneLoading());
+  EXPECT_FALSE(force_installed_tracker()->IsDoneLoading());
 
-  tracker_->OnExtensionReady(profile_, ext1.get());
+  force_installed_tracker()->OnExtensionReady(profile(), ext1.get());
   EXPECT_FALSE(loaded_called_);
   EXPECT_FALSE(ready_called_);
-  EXPECT_FALSE(tracker_->IsDoneLoading());
+  EXPECT_FALSE(force_installed_tracker()->IsDoneLoading());
 }
 
 // This test verifies that applying a new policy value for force installed
@@ -102,12 +102,12 @@ TEST_F(ForceInstalledTrackerTest, ObserversOnlyCalledOnce) {
   SetupForceList();
   auto ext1 = ExtensionBuilder(kExtensionName1).SetID(kExtensionId1).Build();
   auto ext2 = ExtensionBuilder(kExtensionName2).SetID(kExtensionId2).Build();
-  tracker_->OnExtensionLoaded(profile_, ext1.get());
-  tracker_->OnExtensionLoaded(profile_, ext2.get());
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext1.get());
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext2.get());
   EXPECT_TRUE(loaded_called_);
 
-  tracker_->OnExtensionReady(profile_, ext1.get());
-  tracker_->OnExtensionReady(profile_, ext2.get());
+  force_installed_tracker()->OnExtensionReady(profile(), ext1.get());
+  force_installed_tracker()->OnExtensionReady(profile(), ext2.get());
   EXPECT_TRUE(ready_called_);
 
   SetupEmptyForceList();
@@ -120,12 +120,12 @@ TEST_F(ForceInstalledTrackerTest, ObserversOnlyCalledOnce) {
 TEST_F(ForceInstalledTrackerTest, ExtensionsInstallationFailed) {
   SetupForceList();
   auto ext1 = ExtensionBuilder(kExtensionName1).SetID(kExtensionId1).Build();
-  tracker_->OnExtensionLoaded(profile_, ext1.get());
-  tracker_->OnExtensionInstallationFailed(
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext1.get());
+  force_installed_tracker()->OnExtensionInstallationFailed(
       kExtensionId2, InstallStageTracker::FailureReason::INVALID_ID);
   EXPECT_TRUE(loaded_called_);
   EXPECT_FALSE(ready_called_);
-  EXPECT_TRUE(tracker_->IsDoneLoading());
+  EXPECT_TRUE(force_installed_tracker()->IsDoneLoading());
 }
 
 // This test tracks the status of the force installed extensions in
@@ -133,22 +133,22 @@ TEST_F(ForceInstalledTrackerTest, ExtensionsInstallationFailed) {
 // failed.
 TEST_F(ForceInstalledTrackerTest, ExtensionsStatus) {
   SetupForceList();
-  EXPECT_EQ(tracker_->extensions().at(kExtensionId1).status,
+  EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId1).status,
             ForceInstalledTracker::ExtensionStatus::PENDING);
-  EXPECT_EQ(tracker_->extensions().at(kExtensionId2).status,
+  EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId2).status,
             ForceInstalledTracker::ExtensionStatus::PENDING);
 
   auto ext1 = ExtensionBuilder(kExtensionName1).SetID(kExtensionId1).Build();
-  tracker_->OnExtensionLoaded(profile_, ext1.get());
-  tracker_->OnExtensionInstallationFailed(
+  force_installed_tracker()->OnExtensionLoaded(profile(), ext1.get());
+  force_installed_tracker()->OnExtensionInstallationFailed(
       kExtensionId2, InstallStageTracker::FailureReason::INVALID_ID);
-  EXPECT_EQ(tracker_->extensions().at(kExtensionId1).status,
+  EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId1).status,
             ForceInstalledTracker::ExtensionStatus::LOADED);
-  EXPECT_EQ(tracker_->extensions().at(kExtensionId2).status,
+  EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId2).status,
             ForceInstalledTracker::ExtensionStatus::FAILED);
 
-  tracker_->OnExtensionReady(profile_, ext1.get());
-  EXPECT_EQ(tracker_->extensions().at(kExtensionId1).status,
+  force_installed_tracker()->OnExtensionReady(profile(), ext1.get());
+  EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId1).status,
             ForceInstalledTracker::ExtensionStatus::READY);
 }