Merge pull request #19169 from brave/explicitly-initialize-testing-ptrs

Explicitly initialize test ptrs to nullptr
brave · Jul 8, 2023 · f7dafff · f7dafff
2 parents e29428b + 4dc47b9
commit f7dafff
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc
@@ -118,6 +118,12 @@ void AdBlockServiceTest::PreRunTestOnMainThread() {
   WaitForAdBlockServiceThreads();
 }
 
+void AdBlockServiceTest::TearDownOnMainThread() {
+  // Unset the host resolver so as not to interfere with later tests.
+  brave::SetAdblockCnameHostResolverForTesting(nullptr);
+  ExtensionBrowserTest::TearDownOnMainThread();
+}
+
 content::WebContents* AdBlockServiceTest::web_contents() {
   return browser()->tab_strip_model()->GetActiveWebContents();
 }
@@ -1042,9 +1048,6 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,
                                             bad_resource_url.spec().c_str())));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 3ULL);
   ASSERT_EQ(4ULL, inner_resolver->num_resolve());
-
-  // Unset the host resolver so as not to interfere with later tests.
-  brave::SetAdblockCnameHostResolverForTesting(nullptr);
 }
 
 // Make sure that an exception for a URL can apply to a blocking decision made
@@ -1130,9 +1133,6 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,
                                             bad_resource_url.spec().c_str())));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 3ULL);
   ASSERT_EQ(4ULL, inner_resolver->num_resolve());
-
-  // Unset the host resolver so as not to interfere with later tests.
-  brave::SetAdblockCnameHostResolverForTesting(nullptr);
 }
 
 class CnameUncloakingFlagDisabledTest : public AdBlockServiceTest {
@@ -1223,9 +1223,6 @@ IN_PROC_BROWSER_TEST_F(CnameUncloakingFlagDisabledTest, NoDnsQueriesIssued) {
                                             bad_resource_url.spec().c_str())));
   EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL);
   ASSERT_EQ(0ULL, inner_resolver->num_resolve());
-
-  // Unset the host resolver so as not to interfere with later tests.
-  brave::SetAdblockCnameHostResolverForTesting(nullptr);
 }
 
 // Load an image from a specific subdomain, and make sure it is blocked.

diff --git a/browser/brave_shields/ad_block_service_browsertest.h b/browser/brave_shields/ad_block_service_browsertest.h
@@ -30,6 +30,7 @@ class AdBlockServiceTest : public extensions::ExtensionBrowserTest {
   void SetUpOnMainThread() override;
   void SetUp() override;
   void PreRunTestOnMainThread() override;
+  void TearDownOnMainThread() override;
 
  protected:
   content::ContentMockCertVerifier mock_cert_verifier_;

diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper.cc b/browser/net/brave_ad_block_tp_network_delegate_helper.cc
@@ -47,7 +47,7 @@ const std::string& GetCanonicalName(
 
 }  // namespace
 
-network::HostResolver* g_testing_host_resolver;
+network::HostResolver* g_testing_host_resolver = nullptr;
 
 void SetAdblockCnameHostResolverForTesting(
     network::HostResolver* host_resolver) {

diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.cc b/components/brave_shields/browser/ad_block_subscription_service_manager.cc
@@ -31,7 +31,7 @@
 
 namespace brave_shields {
 
-base::TimeDelta* g_testing_subscription_retry_interval;
+base::TimeDelta* g_testing_subscription_retry_interval = nullptr;
 
 namespace {