Merge pull request #8845 from brave/rewards-fix-ads-upgrade-browser-t…

…est-crash Only wait for OnRewardsInitialized if it didn't already fire
brave · May 19, 2021 · 5fc68f6 · 5fc68f6
2 parents 36de5d0 + 937d0c5
commit 5fc68f6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/components/brave_ads/browser/ads_service_browsertest.cc b/components/brave_ads/browser/ads_service_browsertest.cc
@@ -102,17 +102,25 @@ class TestRewardsServiceObserver
   ~TestRewardsServiceObserver() override = default;
 
   void WaitForRewardsInitialization() {
+    if (rewards_initialized_) {
+      return;
+    }
+
     run_loop_ = std::make_unique<base::RunLoop>();
     run_loop_->Run();
   }
 
   // RewardsServiceObserver implementation
   void OnRewardsInitialized(brave_rewards::RewardsService* service) override {
-    run_loop_->Quit();
+    rewards_initialized_ = true;
+    if (run_loop_) {
+      run_loop_->Quit();
+    }
   }
 
  private:
   std::unique_ptr<base::RunLoop> run_loop_;
+  bool rewards_initialized_ = false;
 };
 
 class BraveAdsBrowserTest : public InProcessBrowserTest,