[M130 Migration] Remove BRINGUP Macro

Remove BRINGUP macro

Change-Id: I2a760c3238b7b0d8ab27ff66bae1290d12d17449
Signed-off-by: feifei <feifei08.liu@samsung.com>

diff --git a/components/autofill/content/renderer/password_form_conversion_utils.cc b/components/autofill/content/renderer/password_form_conversion_utils.cc
index 54596ba5b6f30f5d1a0d8c1228998fbf3b7e15fb..d0206ca62a2ec13db8b443d97d6801cb514e339d 100644 (file)
--- a/components/autofill/content/renderer/password_form_conversion_utils.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils.cc
@@ -155,11 +155,10 @@ std::optional<FormData> CreateFormDataFromWebForm(
       IsGaiaWithSkipSavePasswordForm(web_form) ||
       IsGaiaReauthenticationForm(web_form));
 
-  LOG(ERROR) << " Please Remove EWK_BRINGUP";
-#if defined(TIZEN_AUTOFILL_FW) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
-  if (!HasPasswordContents(form_data->fields)) {
+#if defined(TIZEN_AUTOFILL_FW)
+if (!HasPasswordContents(form_data->fields())) {
     LOG(INFO) << "[Autofill] " << __FUNCTION__ << ", not a password form";
-    return nullptr;
+    return std::nullopt;
   }
 #endif
 
@@ -168,9 +167,8 @@ std::optional<FormData> CreateFormDataFromWebForm(
   form_data->set_button_titles(
       form_util::GetButtonTitles(web_form, button_titles_cache));
 
-  LOG(ERROR) << " Please Remove EWK_BRINGUP";
-#if defined(TIZEN_AUTOFILL_FW) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
-  form_data->title = web_form.GetDocument().Title().Utf8();
+#if defined(TIZEN_AUTOFILL_FW)
+  form_data->set_title(web_form.GetDocument().Title().Utf8());
 #endif
 
   return form_data;
@@ -188,11 +186,10 @@ std::optional<FormData> CreateFormDataFromUnownedInputElements(
     return std::nullopt;
   }
 
-   LOG(ERROR) << " Please Remove EWK_BRINGUP";
-#if defined(TIZEN_AUTOFILL_FW) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
-  if (!HasPasswordContents(form_data->fields)) {
+#if defined(TIZEN_AUTOFILL_FW)
+  if (!HasPasswordContents(form_data->fields())) {
     LOG(INFO) << "[Autofill] " << __FUNCTION__ << ", not a password form";
-    return nullptr;
+    return std::nullopt;
   }
 #endif
   if (base::FeatureList::IsEnabled(
@@ -206,9 +203,8 @@ std::optional<FormData> CreateFormDataFromUnownedInputElements(
   form_data->set_username_predictions(
       GetUsernamePredictions(*form_data, username_detector_cache));
 
-  LOG(ERROR) << " Please Remove EWK_BRINGUP";
-#if defined(TIZEN_AUTOFILL_FW) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
-  form_data->title = frame.GetDocument().Title().Utf8();
+#if defined(TIZEN_AUTOFILL_FW)
+  form_data->set_title(frame.GetDocument().Title().Utf8());
 #endif
 
   return form_data;

diff --git a/components/autofill/core/browser/payments/credit_card_save_manager.cc b/components/autofill/core/browser/payments/credit_card_save_manager.cc
index 653451926f81ddd647a7c64ccdaa47a29998c66f..f0a7c75fafc57fbf84da5c815ed8c7e690268966 100644 (file)
--- a/components/autofill/core/browser/payments/credit_card_save_manager.cc
+++ b/components/autofill/core/browser/payments/credit_card_save_manager.cc
@@ -430,14 +430,6 @@ void CreditCardSaveManager::AttemptToOfferCvcUploadSave(
 }
 
 bool CreditCardSaveManager::IsCreditCardUploadEnabled() {
-  LOG(ERROR) << " Please Remove EWK_BRINGUP";
-#if defined(TIZEN_AUTOFILL_FW) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
-  if (!personal_data_manager_) {
-    LOG(INFO) << "Autofill " << __FUNCTION__
-              << "  Invalid personal_data_manager_";
-    return false;
-  }
-#endif
 #if BUILDFLAG(IS_IOS)
   // If observer_for_testing_ is set, assume we are in a browsertest and
   // credit card upload should be enabled by default.

diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index c6baf151eaac164e988a61157b91ea438a2408fd..674b843475d1cfc5d9fb538066e395c7f7b4aaf5 100644 (file)
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -1415,14 +1415,13 @@ void PasswordManager::OnLoginSuccessful() {
       "PasswordManager.SuccessfulLoginHappened",
       submitted_manager->GetSubmittedForm()->url.SchemeIsCryptographic());
 
-  LOG(ERROR) << " Please Remove EWK_BRINGUP";
-#if defined(TIZEN_AUTOFILL_FW) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
+#if defined(TIZEN_AUTOFILL_FW)
   FormData form = submitted_manager->GetSubmittedForm()->form_data;
 
-  for (size_t i = 0; i < form.fields.size(); i++) {
-    if (form.fields[i].is_autofilled()) {
+  for (size_t i = 0; i < form.fields().size(); i++) {
+    if ((form.fields())[i].is_autofilled()) {
       LOG(ERROR) << "[Autofill] " << __FUNCTION__ << "\t label : "
-                 << base::UTF16ToUTF8(form.fields[i].label()).c_str();
+                 << base::UTF16ToUTF8((form.fields())[i].label()).c_str();
       LOG(ERROR) << "[Autofill] " << __FUNCTION__
                  << " is_autofilled! do not send commit request";