Build fixes for Chromium 105 uplift to 1.43.x.

brave · Aug 23, 2022 · 3ed81e4 · 3ed81e4
1 parent a00023a
commit 3ed81e4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 47 deletions.
diff --git a/browser/ui/webui/sidebar/sidebar_bookmarks_page_handler.cc b/browser/ui/webui/sidebar/sidebar_bookmarks_page_handler.cc
@@ -94,10 +94,11 @@ class BookmarkContextMenu : public ui::SimpleMenuModel,
 
  private:
   void AddItem(int command_id) {
-    ui::SimpleMenuModel::AddItem(
-        command_id,
-        controller_->menu_model()->GetLabelAt(
-            controller_->menu_model()->GetIndexOfCommandId(command_id)));
+    ui::SimpleMenuModel::AddItem(command_id,
+                                 controller_->menu_model()->GetLabelAt(
+                                     controller_->menu_model()
+                                         ->GetIndexOfCommandId(command_id)
+                                         .value()));
   }
 
   std::unique_ptr<BookmarkContextMenuController> controller_;

diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_view_layout.cc b/chromium_src/chrome/browser/ui/views/frame/browser_view_layout.cc
diff --git a/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator_unittest.cc b/chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator_unittest.cc
diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
@@ -1792,12 +1792,8 @@ void AdsServiceImpl::RecordP2AEvent(const std::string& name,
     return;
   }
 
-  base::ListValue* list = nullptr;
-  if (!maybe_list->GetAsList(&list)) {
-    return;
-  }
-
-  for (auto& item : list->GetList()) {
+  auto& list = maybe_list->GetList();
+  for (auto& item : list) {
     RecordInWeeklyStorageAndEmitP2AHistogramAnswer(profile_->GetPrefs(),
                                                    item.GetString());
   }

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/segments/segment_json_reader.cc b/vendor/bat-native-ads/src/bat/ads/internal/segments/segment_json_reader.cc
@@ -14,17 +14,13 @@ namespace JSONReader {
 
 SegmentList ReadSegments(const std::string& json) {
   absl::optional<base::Value> value = base::JSONReader::Read(json);
-  if (!value) {
-    return {};
-  }
-
-  base::ListValue* list = nullptr;
-  if (!value->GetAsList(&list)) {
+  if (!value || !value->is_list()) {
     return {};
   }
 
   SegmentList segments;
-  for (const auto& element : list->GetList()) {
+  auto& list = value->GetList();
+  for (const auto& element : list) {
     if (!element.is_string()) {
       return {};
     }