use std::unique_ptr instead of absl::optional

brave · Sep 19, 2023 · cfe8a82 · cfe8a82
1 parent e274e6a
commit cfe8a82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/components/brave_shields/browser/ad_block_service.cc b/components/brave_shields/browser/ad_block_service.cc
@@ -73,7 +73,7 @@ void AdBlockService::SourceProviderObserver::OnChanged() {
 
 void AdBlockService::SourceProviderObserver::OnFilterSetLoaded(
     std::unique_ptr<rust::Box<adblock::FilterSet>> filter_set) {
-  filter_set_ = absl::make_optional(std::move(*filter_set));
+  filter_set_ = std::move(filter_set);
   // multiple AddObserver calls are ignored
   resource_provider_->AddObserver(this);
   resource_provider_->LoadResources(base::BindOnce(
@@ -90,14 +90,13 @@ void AdBlockService::SourceProviderObserver::OnResourcesLoaded(
   } else {
     auto engine_load_callback = base::BindOnce(
         [](base::WeakPtr<AdBlockEngine> engine,
-           rust::Box<adblock::FilterSet> filter_set,
+           std::unique_ptr<rust::Box<adblock::FilterSet>> filter_set,
            const std::string& resources_json) {
           if (engine) {
-            engine->Load(std::move(filter_set), resources_json);
+            engine->Load(std::move(*filter_set.get()), resources_json);
           }
         },
-        adblock_engine_->AsWeakPtr(), std::move(*filter_set_), resources_json);
-    filter_set_.reset();
+        adblock_engine_->AsWeakPtr(), std::move(filter_set_), resources_json);
     task_runner_->PostTask(FROM_HERE, std::move(engine_load_callback));
   }
 }

diff --git a/components/brave_shields/browser/ad_block_service.h b/components/brave_shields/browser/ad_block_service.h
@@ -75,7 +75,7 @@ class AdBlockService {
     // AdBlockResourceProvider::Observer
     void OnResourcesLoaded(const std::string& resources_json) override;
 
-    absl::optional<rust::Box<adblock::FilterSet>> filter_set_;
+    std::unique_ptr<rust::Box<adblock::FilterSet>> filter_set_;
     raw_ptr<AdBlockEngine> adblock_engine_;
     raw_ptr<AdBlockFiltersProvider> filters_provider_;    // not owned
     raw_ptr<AdBlockResourceProvider> resource_provider_;  // not owned