Remove EWK_BRINGUPS for M120 #1

This commit removes some EWK_BRINGUPs added during M120 upversion.
Upgrading to Clang18 fixed some of the build errors.

Change-Id: Id71747db710ebe7002829db7ae52c28989db883e
Signed-off-by: v-saha <v.saha@samsung.com>

diff --git a/components/attribution_reporting/trigger_registration.cc b/components/attribution_reporting/trigger_registration.cc
index 35e0234..4f0f0b5 100644 (file)
--- a/components/attribution_reporting/trigger_registration.cc
+++ b/components/attribution_reporting/trigger_registration.cc
@@ -109,16 +109,8 @@ base::expected<std::vector<T>, TriggerRegistrationError> ParseList(
   vec.reserve(list->size());
 
   for (auto& value : *list) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     ASSIGN_OR_RETURN(T element, build_element(value));
     vec.push_back(std::move(element));
-#else
-    base::expected<T, TriggerRegistrationError> element = build_element(value);
-    if (!element.has_value()) {
-      return base::unexpected(element.error());
-    }
-    vec.push_back(std::move(*element));
-#endif
   }
 
   return vec;

diff --git a/components/autofill/core/browser/contact_info_sync_util.cc b/components/autofill/core/browser/contact_info_sync_util.cc
index 63ff178..b5b0a0b 100644 (file)
--- a/components/autofill/core/browser/contact_info_sync_util.cc
+++ b/components/autofill/core/browser/contact_info_sync_util.cc
@@ -195,11 +195,9 @@ class ContactInfoProfileSetter {
       CHECK(observations.empty());
       for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation :
            metadata.observations()) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
         observations.emplace_back(proto_observation.type(),
                                   ProfileTokenQuality::FormSignatureHash(
                                       proto_observation.form_hash()));
-#endif
       }
     }
   }

diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
index 3b82c27..51b71b7 100644 (file)
--- a/components/autofill/core/browser/webdata/autofill_table.cc
+++ b/components/autofill/core/browser/webdata/autofill_table.cc
@@ -1763,17 +1763,10 @@ std::unique_ptr<AutofillProfile> AutofillTable::GetAutofillProfile(
     }
 
     base::span<const uint8_t> observations_data = s.ColumnBlob(3);
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     field_type_values.emplace_back(
         type, s.ColumnString16(1), s.ColumnInt(2),
         std::vector<uint8_t>(observations_data.begin(),
                              observations_data.end()));
-#else
-    field_type_values.emplace_back(
-        FieldTypeData{type, s.ColumnString16(1), s.ColumnInt(2),
-                      std::vector<uint8_t>(observations_data.begin(),
-                                           observations_data.end())});
-#endif
     if (type == ADDRESS_HOME_COUNTRY) {
       country_code = base::UTF16ToUTF8(s.ColumnString16(1));
     }

diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index 0cbdc3d..4f73e24 100644 (file)
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -639,13 +639,11 @@ void PasswordManager::OnUserModifiedNonPasswordField(
     bool is_likely_otp) {
   // |driver| might be empty on iOS or in tests.
   int driver_id = driver ? driver->GetId() : 0;
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   possible_usernames_.Put(
       PossibleUsernameFieldIdentifier(driver_id, renderer_id),
       PossibleUsernameData(GetSignonRealm(driver->GetLastCommittedURL()),
                            renderer_id, value, base::Time::Now(), driver_id,
                            autocomplete_attribute_has_username, is_likely_otp));
-#endif
   if (base::FeatureList::IsEnabled(
           password_manager::features::kForgotPasswordFormSupport)) {
     FieldInfoManager* field_info_manager = client_->GetFieldInfoManager();

diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index b22c500..5bd4ca1 100644 (file)
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -767,14 +767,8 @@ void SavePackage::Finish() {
   if (download_) {
     std::vector<download::DownloadSaveItemData::ItemInfo> files;
     for (auto& item : saved_success_items_) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       files.emplace_back(item.second->full_path(), item.second->url(),
                          item.second->referrer().url);
-#else
-      files.emplace_back(download::DownloadSaveItemData::ItemInfo(
-          item.second->full_path(), item.second->url(),
-          item.second->referrer().url));
-#endif
     }
     download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
   }

diff --git a/content/browser/interest_group/header_direct_from_seller_signals.h b/content/browser/interest_group/header_direct_from_seller_signals.h
index d7d3035..59c695e 100644 (file)
--- a/content/browser/interest_group/header_direct_from_seller_signals.h
+++ b/content/browser/interest_group/header_direct_from_seller_signals.h
@@ -97,19 +97,11 @@ class CONTENT_EXPORT HeaderDirectFromSellerSignals {
   }
 
  private:
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   const absl::optional<std::string> seller_signals_;
 
   const absl::optional<std::string> auction_signals_;
 
   const base::flat_map<url::Origin, std::string> per_buyer_signals_;
-#else
-  absl::optional<std::string> seller_signals_;
-
-  absl::optional<std::string> auction_signals_;
-
-  base::flat_map<url::Origin, std::string> per_buyer_signals_;
-#endif
 };
 
 }  // namespace content

diff --git a/content/browser/interest_group/interest_group_storage.cc b/content/browser/interest_group/interest_group_storage.cc
index a01ace3..22a183f 100644 (file)
--- a/content/browser/interest_group/interest_group_storage.cc
+++ b/content/browser/interest_group/interest_group_storage.cc
@@ -3002,17 +3002,10 @@ DoGetKAnonymityData(sql::Database& db,
 
   std::vector<StorageInterestGroup::KAnonymityData> k_anon_data;
   while (interest_group_kanon_query.Step()) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     k_anon_data.emplace_back(
         /*key=*/interest_group_kanon_query.ColumnString(0),
         /*is_k_anonymous=*/interest_group_kanon_query.ColumnBool(1),
         /*last_updated=*/interest_group_kanon_query.ColumnTime(2));
-#else
-    k_anon_data.emplace_back(StorageInterestGroup::KAnonymityData(
-        interest_group_kanon_query.ColumnString(0),
-        interest_group_kanon_query.ColumnBool(1),
-        interest_group_kanon_query.ColumnTime(2)));
-#endif
   }
   if (!interest_group_kanon_query.Succeeded()) {
     return absl::nullopt;

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 6fd2953..adba336 100644 (file)
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8696,11 +8696,9 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeacon(
 
   for (const blink::FencedFrame::ReportingDestination& destination :
        destinations) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     SendFencedFrameReportingBeaconInternal(
         DestinationEnumEvent(event_type, event_data), destination,
         /*from_renderer=*/true, attribution_reporting_runtime_features);
-#endif
   }
 }
 
@@ -8733,12 +8731,10 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeaconToCustomURL(
     return;
   }
 
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   SendFencedFrameReportingBeaconInternal(
       DestinationURLEvent(destination_url),
       blink::FencedFrame::ReportingDestination::kBuyer,
       /*from_renderer=*/true, attribution_reporting_runtime_features);
-#endif
 }
 
 void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon(
@@ -8834,14 +8830,12 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon(
                     destination) != info->destinations.end()) {
         data = info->data;
       }
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       initiator_rfh->SendFencedFrameReportingBeaconInternal(
           DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
                                data),
           destination,
           /*from_renderer=*/false, attribution_reporting_features,
           navigation_request.GetNavigationId());
-#endif
     }
   } else {
     if (!info->destinations.empty()) {
@@ -8850,14 +8844,12 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon(
 
     for (blink::FencedFrame::ReportingDestination destination :
          info->destinations) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       initiator_rfh->SendFencedFrameReportingBeaconInternal(
           DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
                                info->data),
           destination,
           /*from_renderer=*/false, info->attribution_reporting_runtime_features,
           navigation_request.GetNavigationId());
-#endif
     }
   }
 

diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index 2689d90..3517950 100644 (file)
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -316,7 +316,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
       is_capturing_(false),
       timeout_count_(0),
       rotation_(rotation) {
-#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX)
   use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
 #endif  // BUILDFLAG(IS_LINUX)
 }
@@ -443,7 +443,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
 
   client_->OnStarted();
 
-#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX)
   if (use_gpu_buffer_) {
     v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(
         std::move(gmb_support_test_));
@@ -1146,7 +1146,7 @@ void V4L2CaptureDelegate::DoCapture() {
       // workable on Linux.
 
       // See http://crbug.com/959919.
-#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX)
       if (use_gpu_buffer_) {
         v4l2_gpu_helper_->OnIncomingCapturedData(
             client_.get(), buffer_tracker->start(),

diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h
index 7fddf91..59d44c3 100644 (file)
--- a/media/capture/video/linux/v4l2_capture_delegate.h
+++ b/media/capture/video/linux/v4l2_capture_delegate.h
@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
   // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
   int rotation_;
 
-#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX)
   // Support GPU memory buffer.
   bool use_gpu_buffer_;
   std::unique_ptr<V4L2CaptureDelegateGpuHelper> v4l2_gpu_helper_;

diff --git a/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.h.tmpl b/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.h.tmpl
index a64ccb1..f962fe9 100644 (file)
--- a/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.h.tmpl
+++ b/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.h.tmpl
@@ -212,11 +212,7 @@ class ComputedStyleBase : public GarbageCollected<ComputedStyleBase> {
     {% endfor %}
   }
 
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
  private:
-#else
- public:
-#endif
 
   {% for subgroup in computed_style.subgroups %}
   {{declare_field_group_class(subgroup)|indent(2)}}

diff --git a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
index 25ab98c..1ce08e9 100644 (file)
--- a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
+++ b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
@@ -31,10 +31,8 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterpolation::MixColorRecords(
         color_interpolation_space, hue_interpolation_method, start_color,
         end_color, percentage, alpha_multiplier);
 
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     FontPalette::FontPaletteOverride result_color_record(i, result_color);
     result_color_records.push_back(result_color_record);
-#endif
   }
   return result_color_records;
 }