Using autofill::RendererId types in FormActivityParams.

Making use of available strong FormRendererId and FieldRendererId types
in iOS code.

Change-Id: I9b551f3dd03b9b8239f67606359274d781354967
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2414222Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: John Wu <jzw@chromium.org>
Reviewed-by: Matthias Körber <koerber@google.com>
Commit-Queue: Maria Kazinova <kazinova@google.com>
Cr-Commit-Position: refs/heads/master@{#808046}

components/autofill/core/common/renderer_id.h

@@ -12,6 +12,9 @@
 
 namespace autofill {
 
+// A value that can be provided by the renderer in cases when the ID is missing.
+constexpr int kNotSetRendererID = -1;
+
 namespace internal {
 
 using FormRendererIdType = ::util::IdType<class FormRendererIdMarker,

components/autofill/ios/browser/autofill_util.h

@@ -12,10 +12,6 @@
 @class CRWJSInjectionReceiver;
 class GURL;
 
-namespace {
-constexpr int kNotSetRendererID = -1;
-}
-
 namespace base {
 class DictionaryValue;
 }

components/autofill/ios/form_util/form_activity_params.h

@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "components/autofill/core/common/renderer_id.h"
+
 namespace autofill {
 
 // Wraps information about event happening in a form.
@@ -31,10 +33,10 @@ struct FormActivityParams {
   ~FormActivityParams();
 
   std::string form_name;
-  uint32_t unique_form_id;
+  FormRendererId unique_form_id;
   // Generated by __gCrWeb.form.getFieldIdentifier in form.js.
   std::string field_identifier;
-  uint32_t unique_field_id;
+  FieldRendererId unique_field_id;
   std::string field_type;
   std::string type;
   std::string value;

components/autofill/ios/form_util/form_activity_tab_helper.mm

@@ -19,6 +19,9 @@
 #error "This file requires ARC support."
 #endif
 
+using base::NumberToString;
+using base::StringToUint;
+
 namespace autofill {
 
 namespace {
@@ -97,8 +100,15 @@ bool FormActivityTabHelper::HandleFormActivity(
       !message.GetBoolean("hasUserGesture", &params.has_user_gesture)) {
     params.input_missing = true;
   }
-  base::StringToUint(unique_form_id, &params.unique_form_id);
-  base::StringToUint(unique_field_id, &params.unique_field_id);
+  if (unique_form_id != NumberToString(kNotSetRendererID))
+    StringToUint(unique_form_id, &params.unique_form_id.value());
+  else
+    params.unique_form_id = FormRendererId();
+
+  if (unique_field_id != NumberToString(kNotSetRendererID))
+    StringToUint(unique_field_id, &params.unique_field_id.value());
+  else
+    params.unique_field_id = FieldRendererId();
 
   params.is_main_frame = form_in_main_frame;
   if (!sender_frame) {

components/password_manager/ios/js_password_manager.mm

@@ -20,6 +20,7 @@ using autofill::CreateBoolCallback;
 using autofill::CreateStringCallback;
 using autofill::FormRendererId;
 using autofill::FieldRendererId;
+using autofill::kNotSetRendererID;
 using base::SysNSStringToUTF8;
 
 namespace password_manager {

components/password_manager/ios/shared_password_controller.mm

@@ -648,7 +648,7 @@ NSString* const kSuggestionSuffix = @" ••••••••";
   if (params.type == "password_form_removed") {
     _passwordManager->OnPasswordFormRemoved(
         _delegate.passwordManagerDriver, self.formHelper.fieldDataManager.get(),
-        FormRendererId(params.unique_form_id));
+        params.unique_form_id);
   }
 }
 

ios/chrome/browser/autofill/form_suggestion_controller.mm

@@ -194,9 +194,9 @@ AutofillSuggestionState::AutofillSuggestionState(
 
   FormSuggestionProviderQuery* formQuery = [[FormSuggestionProviderQuery alloc]
       initWithFormName:base::SysUTF8ToNSString(params.form_name)
-          uniqueFormID:FormRendererId(params.unique_form_id)
+          uniqueFormID:params.unique_form_id
        fieldIdentifier:base::SysUTF8ToNSString(params.field_identifier)
-         uniqueFieldID:FieldRendererId(params.unique_field_id)
+         uniqueFieldID:params.unique_field_id
              fieldType:base::SysUTF8ToNSString(params.field_type)
                   type:base::SysUTF8ToNSString(params.type)
             typedValue:base::SysUTF8ToNSString(
@@ -346,9 +346,8 @@ AutofillSuggestionState::AutofillSuggestionState(
               (FormSuggestionsReadyCompletion)accessoryViewUpdateBlock {
   [self processPage:webState];
   _suggestionState.reset(new AutofillSuggestionState(
-      params.form_name, FormRendererId(params.unique_form_id),
-      params.field_identifier, FieldRendererId(params.unique_field_id),
-      params.frame_id, params.value));
+      params.form_name, params.unique_form_id, params.field_identifier,
+      params.unique_field_id, params.frame_id, params.value));
   _accessoryViewUpdateBlock = [accessoryViewUpdateBlock copy];
   [self retrieveSuggestionsForForm:params webState:webState];
 }

ios/chrome/browser/passwords/password_controller_unittest.mm

@@ -1964,7 +1964,7 @@ TEST_F(PasswordControllerTest, DetectSubmissionOnRemovedForm) {
   WebFrame* frame = web::GetWebFrameWithId(web_state(), mainFrameID);
   FormActivityParams params;
   params.type = "password_form_removed";
-  params.unique_form_id = 0;
+  params.unique_form_id = FormRendererId(0);
   params.frame_id = mainFrameID;
 
   [passwordController_.sharedPasswordController webState:web_state()
@@ -2003,7 +2003,7 @@ TEST_F(PasswordControllerTest,
   WebFrame* frame = web::GetWebFrameWithId(web_state(), mainFrameID);
   FormActivityParams params;
   params.type = "password_form_removed";
-  params.unique_form_id = 0;
+  params.unique_form_id = FormRendererId(0);
   params.frame_id = mainFrameID;
 
   [passwordController_.sharedPasswordController webState:web_state()

ios/web_view/internal/autofill/cwv_autofill_controller.mm

@@ -477,10 +477,10 @@ showUnmaskPromptForCard:(const autofill::CreditCard&)creditCard
   DCHECK_EQ(_webState, webState);
 
   NSString* nsFormName = base::SysUTF8ToNSString(params.form_name);
-  _lastFormActivityUniqueFormID = FormRendererId(params.unique_form_id);
+  _lastFormActivityUniqueFormID = params.unique_form_id;
   NSString* nsFieldIdentifier =
       base::SysUTF8ToNSString(params.field_identifier);
-  _lastFormActivityUniqueFieldID = FieldRendererId(params.unique_field_id);
+  _lastFormActivityUniqueFieldID = params.unique_field_id;
   NSString* nsFieldType = base::SysUTF8ToNSString(params.field_type);
   NSString* nsFrameID = base::SysUTF8ToNSString(GetWebFrameId(frame));
   NSString* nsValue = base::SysUTF8ToNSString(params.value);

ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm

@@ -55,6 +55,8 @@
 #error "This file requires ARC support."
 #endif
 
+using autofill::FormRendererId;
+using autofill::FieldRendererId;
 using base::test::ios::kWaitForActionTimeout;
 using base::test::ios::WaitUntilConditionOrTimeout;
 
@@ -64,9 +66,9 @@ namespace {
 
 const char kApplicationLocale[] = "en-US";
 NSString* const kTestFormName = @"FormName";
-uint32_t kTestUniqueFormID = 0;
+FormRendererId kTestUniqueFormID = FormRendererId(0);
 NSString* const kTestFieldIdentifier = @"FieldIdentifier";
-uint32_t kTestUniqueFieldID = 1;
+FieldRendererId kTestUniqueFieldID = FieldRendererId(1);
 NSString* const kTestFieldValue = @"FieldValue";
 NSString* const kTestDisplayDescription = @"DisplayDescription";