Call JS using WebFrame when flag is enabled.

This CL does not add support to autofill in iFrames.
Unittests may fail with the Autofill in iFrame flag enabled.
This will be solve in a future CL.

Bug: 881364
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I38cd09b7aec31d8e47eea8e756ef937bcdde7b1b
Reviewed-on: https://chromium-review.googlesource.com/1230062
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593160}

components/autofill/ios/browser/autofill_agent.h

@@ -44,16 +44,19 @@ class WebState;
                  (const base::WeakPtr<autofill::AutofillPopupDelegate>&)
                      delegate;
 
-// The supplied data should be filled into the form.
-- (void)onFormDataFilled:(const autofill::FormData&)result;
+// The supplied data should be filled into the form in |frame|.
+- (void)onFormDataFilled:(const autofill::FormData&)result
+                 inFrame:(web::WebFrame*)frame;
 
 // Detatches from the web state.
 - (void)detachFromWebState;
 
-// Renders the field type predictions specified in |forms|. This method is a
-// no-op if the relevant experiment is not enabled.
+// Renders the field type predictions specified in |forms| in |frame|. This
+// method is a no-op if the kAutofillShowTypePredictions experiment is not
+// enabled.
 - (void)renderAutofillTypePredictions:
-    (const std::vector<autofill::FormDataPredictions>&)forms;
+            (const std::vector<autofill::FormDataPredictions>&)forms
+                              inFrame:(web::WebFrame*)frame;
 
 @end
 

components/autofill/ios/browser/autofill_agent_unittests.mm

@@ -17,6 +17,7 @@
 #include "ios/web/public/test/fakes/fake_web_frame.h"
 #import "ios/web/public/test/fakes/test_web_state.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
+#include "ios/web/public/web_state/web_frame_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
@@ -108,6 +109,7 @@ TEST_F(AutofillAgentTests, OnFormDataFilledTest) {
   field.value = base::ASCIIToUTF16("");
   field.is_autofilled = true;
   form.fields.push_back(field);
+  // TODO(crbug.com/881364): Fix for WebFrameMessaging.
   // Fields are in alphabetical order.
   [[mock_js_injection_receiver_ expect]
       executeJavaScript:
@@ -116,7 +118,8 @@ TEST_F(AutofillAgentTests, OnFormDataFilledTest) {
           @"\"number\":{\"section\":\"\",\"value\":\"number_value\"}},"
           @"\"formName\":\"CC form\"}, \"\");"
       completionHandler:[OCMArg any]];
-  [autofill_agent_ onFormDataFilled:form];
+  [autofill_agent_ onFormDataFilled:form
+                            inFrame:web::GetMainWebFrame(&test_web_state_)];
   test_web_state_.WasShown();
 
   EXPECT_OCMOCK_VERIFY(mock_js_injection_receiver_);
@@ -149,6 +152,7 @@ TEST_F(AutofillAgentTests, OnFormDataFilledWithNameCollisionTest) {
   field.value = base::ASCIIToUTF16("value 2");
   field.is_autofilled = true;
   form.fields.push_back(field);
+  // TODO(crbug.com/881364): Fix for WebFrameMessaging.
   // Fields are in alphabetical order.
   [[mock_js_injection_receiver_ expect]
       executeJavaScript:
@@ -157,7 +161,8 @@ TEST_F(AutofillAgentTests, OnFormDataFilledWithNameCollisionTest) {
           @"2\"},\"region\":{\"section\":\"\",\"value\":\"California\"}},"
           @"\"formName\":\"\"}, \"\");"
       completionHandler:[OCMArg any]];
-  [autofill_agent_ onFormDataFilled:form];
+  [autofill_agent_ onFormDataFilled:form
+                            inFrame:web::GetMainWebFrame(&test_web_state_)];
   test_web_state_.WasShown();
 
   EXPECT_OCMOCK_VERIFY(mock_js_injection_receiver_);
@@ -169,6 +174,7 @@ TEST_F(AutofillAgentTests, CheckIfSuggestionsAvailable_UserInitiatedActivity1) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
       autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout);
+  // TODO(crbug.com/881364): Fix for WebFrameMessaging.
   [[mock_js_injection_receiver_ expect]
       executeJavaScript:@"__gCrWeb.autofill.extractForms(1, true);"
       completionHandler:[OCMArg any]];
@@ -194,6 +200,7 @@ TEST_F(AutofillAgentTests, CheckIfSuggestionsAvailable_UserInitiatedActivity2) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndDisableFeature(
       autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout);
+  // TODO(crbug.com/881364): Fix for WebFrameMessaging.
   [[mock_js_injection_receiver_ expect]
       executeJavaScript:@"__gCrWeb.autofill.extractForms(1, false);"
       completionHandler:[OCMArg any]];

components/autofill/ios/browser/fake_js_autofill_manager.h

@@ -13,13 +13,17 @@
 @interface FakeJSAutofillManager : JsAutofillManager
 
 // The name of the form that was most recently passed to
-// |clearAutofilledFieldsForFormName:fieldIdentifier:completionHandler:|.
+// |clearAutofilledFieldsForFormName:fieldIdentifier:inFrame:completionHandler:|
 @property(nonatomic, copy, readonly) NSString* lastClearedFormName;
 
 // The field identifier that was most recently passed to
-// |clearAutofilledFieldsForFormName:fieldIdentifier:completionHandler:|.
+// |clearAutofilledFieldsForFormName:fieldIdentifier:inFrame:completionHandler:|
 @property(nonatomic, copy, readonly) NSString* lastClearedFieldIdentifier;
 
+// The field identifier that was most recently passed to
+// |clearAutofilledFieldsForFormName:fieldIdentifier:inFrame:completionHandler:|
+@property(nonatomic, copy, readonly) NSString* lastClearedFrameIdentifier;
+
 @end
 
 #endif  // COMPONENTS_AUTOFILL_IOS_BROWSER_FAKE_JS_AUTOFILL_MANAGER_H_

components/autofill/ios/browser/fake_js_autofill_manager.mm

@@ -5,7 +5,9 @@
 #import "components/autofill/ios/browser/fake_js_autofill_manager.h"
 
 #include "base/bind.h"
+#include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
+#include "ios/web/public/web_state/web_frame.h"
 #include "ios/web/public/web_task_traits.h"
 #include "ios/web/public/web_thread.h"
 
@@ -17,14 +19,20 @@
 
 @synthesize lastClearedFormName = _lastClearedFormName;
 @synthesize lastClearedFieldIdentifier = _lastClearedFieldIdentifier;
+@synthesize lastClearedFrameIdentifier = _lastClearedFrameIdentifier;
 
 - (void)clearAutofilledFieldsForFormName:(NSString*)formName
                          fieldIdentifier:(NSString*)fieldIdentifier
+                                 inFrame:(web::WebFrame*)frame
                        completionHandler:(ProceduralBlock)completionHandler {
   base::PostTaskWithTraits(FROM_HERE, {web::WebThread::UI}, base::BindOnce(^{
                              _lastClearedFormName = [formName copy];
                              _lastClearedFieldIdentifier =
                                  [fieldIdentifier copy];
+                             _lastClearedFrameIdentifier =
+                                 frame ? base::SysUTF8ToNSString(
+                                             frame->GetFrameId())
+                                       : nil;
                              completionHandler();
                            }));
 }

components/autofill/ios/browser/js_autofill_manager.h

@@ -6,24 +6,31 @@
 #define COMPONENTS_AUTOFILL_IOS_BROWSER_JS_AUTOFILL_MANAGER_H_
 
 #include "base/ios/block_types.h"
+#include "base/values.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 
+namespace web {
+class WebFrame;
+}
+
 // Loads the JavaScript file, autofill_controller.js, which contains form
 // parsing and autofill functions.
 @interface JsAutofillManager : NSObject
 
-// Extracts forms from a web page. Only forms with at least |requiredFields|
+// Extracts forms from a web |frame|. Only forms with at least |requiredFields|
 // fields are extracted.
 // |completionHandler| is called with the JSON string of forms of a web page.
 // |completionHandler| cannot be nil.
 - (void)fetchFormsWithMinimumRequiredFieldsCount:(NSUInteger)requiredFieldsCount
+                                         inFrame:(web::WebFrame*)frame
                                completionHandler:
                                    (void (^)(NSString*))completionHandler;
 
-// Fills the data in JSON string |dataString| into the active form field, then
-// executes the |completionHandler|.
-- (void)fillActiveFormField:(NSString*)dataString
+// Fills the data in JSON string |dataString| into the active form field in
+// |frame|, then executes the |completionHandler|.
+- (void)fillActiveFormField:(std::unique_ptr<base::Value>)data
+                    inFrame:(web::WebFrame*)frame
           completionHandler:(ProceduralBlock)completionHandler;
 
 // Fills a number of fields in the same named form for full-form Autofill.
@@ -31,34 +38,39 @@
 // Only empty fields will be filled, except that field named
 // |forceFillFieldIdentifier| will always be filled even if non-empty.
 // |forceFillFieldIdentifier| may be null.
+// Fields must be contained in |frame|.
 // |completionHandler| is called after the forms are filled. |completionHandler|
 // cannot be nil.
-- (void)fillForm:(NSString*)dataString
+- (void)fillForm:(std::unique_ptr<base::Value>)data
     forceFillFieldIdentifier:(NSString*)forceFillFieldIdentifier
+                     inFrame:(web::WebFrame*)frame
            completionHandler:(ProceduralBlock)completionHandler;
 
-// Clear autofilled fields of the specified form. Fields that are not currently
-// autofilled are not modified. Field contents are cleared, and Autofill flag
-// and styling are removed. 'change' events are sent for fields whose contents
-// changed.
+// Clear autofilled fields of the specified form and frame. Fields that are not
+// currently autofilled are not modified. Field contents are cleared, and
+// Autofill flag and styling are removed. 'change' events are sent for fields
+// whose contents changed.
 // |fieldIdentifier| identifies the field that initiated the clear action.
 // |completionHandler| is called after the forms are filled. |completionHandler|
 // cannot be nil.
 - (void)clearAutofilledFieldsForFormName:(NSString*)formName
                          fieldIdentifier:(NSString*)fieldIdentifier
+                                 inFrame:(web::WebFrame*)frame
                        completionHandler:(ProceduralBlock)completionHandler;
 
 // Marks up the form with autofill field prediction data (diagnostic tool).
-- (void)fillPredictionData:(NSString*)dataString;
+- (void)fillPredictionData:(std::unique_ptr<base::Value>)data
+                   inFrame:(web::WebFrame*)frame;
 
-// Adds a delay between filling the form fields.
-- (void)addJSDelay;
+// Adds a delay between filling the form fields in frame.
+- (void)addJSDelayInFrame:(web::WebFrame*)frame;
 
-// Toggles tracking form related changes in the page.
-- (void)toggleTrackingFormMutations:(BOOL)state;
+// Toggles tracking form related changes in the frame.
+- (void)toggleTrackingFormMutations:(BOOL)state inFrame:(web::WebFrame*)frame;
 
-// Toggles tracking the source of the input events in the page.
-- (void)toggleTrackingUserEditedFields:(BOOL)state;
+// Toggles tracking the source of the input events in the frame.
+- (void)toggleTrackingUserEditedFields:(BOOL)state
+                               inFrame:(web::WebFrame*)frame;
 
 // Designated initializer. |receiver| should not be nil.
 - (instancetype)initWithReceiver:(CRWJSInjectionReceiver*)receiver

ios/chrome/browser/autofill/autofill_controller.mm

@@ -191,7 +191,7 @@ showAutofillPopup:(const std::vector<autofill::Suggestion>&)popup_suggestions
 - (void)onFormDataFilled:(uint16_t)query_id
                  inFrame:(web::WebFrame*)frame
                   result:(const autofill::FormData&)result {
-  [_autofillAgent onFormDataFilled:result];
+  [_autofillAgent onFormDataFilled:result inFrame:frame];
   autofill::AutofillManager* manager = [self autofillManagerForFrame:frame];
   if (manager)
     manager->OnDidFillAutofillFormData(result, base::TimeTicks::Now());
@@ -200,7 +200,7 @@ showAutofillPopup:(const std::vector<autofill::Suggestion>&)popup_suggestions
 - (void)sendAutofillTypePredictionsToRenderer:
             (const std::vector<autofill::FormDataPredictions>&)forms
                                       toFrame:(web::WebFrame*)frame {
-  [_autofillAgent renderAutofillTypePredictions:forms];
+  [_autofillAgent renderAutofillTypePredictions:forms inFrame:frame];
 }
 
 @end

ios/chrome/browser/autofill/js_autofill_manager_unittest.mm

@@ -15,6 +15,7 @@
 #import "ios/chrome/browser/web/chrome_web_test.h"
 #import "ios/web/public/test/js_test_util.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
+#include "ios/web/public/web_state/web_frame_util.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "testing/gtest_mac.h"
 
@@ -138,12 +139,14 @@ TEST_F(JsAutofillManagerTest, ExtractForms) {
 
   __block BOOL block_was_called = NO;
   __block NSString* result;
-  [manager_ fetchFormsWithMinimumRequiredFieldsCount:
-                autofill::MinRequiredFieldsForHeuristics()
-                                   completionHandler:^(NSString* actualResult) {
-                                     block_was_called = YES;
-                                     result = [actualResult copy];
-                                   }];
+  [manager_
+      fetchFormsWithMinimumRequiredFieldsCount:
+          autofill::MinRequiredFieldsForHeuristics()
+                                       inFrame:web::GetMainWebFrame(web_state())
+                             completionHandler:^(NSString* actualResult) {
+                               block_was_called = YES;
+                               result = [actualResult copy];
+                             }];
   base::test::ios::WaitUntilCondition(^bool() {
     return block_was_called;
   });
@@ -174,12 +177,14 @@ TEST_F(JsAutofillManagerTest, ExtractFormlessForms_RestrictToFormlessCheckout) {
 
   __block BOOL block_was_called = NO;
   __block NSString* result;
-  [manager_ fetchFormsWithMinimumRequiredFieldsCount:
-                autofill::MinRequiredFieldsForHeuristics()
-                                   completionHandler:^(NSString* actualResult) {
-                                     block_was_called = YES;
-                                     result = [actualResult copy];
-                                   }];
+  [manager_
+      fetchFormsWithMinimumRequiredFieldsCount:
+          autofill::MinRequiredFieldsForHeuristics()
+                                       inFrame:web::GetMainWebFrame(web_state())
+                             completionHandler:^(NSString* actualResult) {
+                               block_was_called = YES;
+                               result = [actualResult copy];
+                             }];
   base::test::ios::WaitUntilCondition(^bool() {
     return block_was_called;
   });
@@ -207,12 +212,14 @@ TEST_F(JsAutofillManagerTest, ExtractFormlessForms_AllFormlessForms) {
 
   __block BOOL block_was_called = NO;
   __block NSString* result;
-  [manager_ fetchFormsWithMinimumRequiredFieldsCount:
-                autofill::MinRequiredFieldsForHeuristics()
-                                   completionHandler:^(NSString* actualResult) {
-                                     block_was_called = YES;
-                                     result = [actualResult copy];
-                                   }];
+  [manager_
+      fetchFormsWithMinimumRequiredFieldsCount:
+          autofill::MinRequiredFieldsForHeuristics()
+                                       inFrame:web::GetMainWebFrame(web_state())
+                             completionHandler:^(NSString* actualResult) {
+                               block_was_called = YES;
+                               result = [actualResult copy];
+                             }];
   base::test::ios::WaitUntilCondition(^bool() {
     return block_was_called;
   });
@@ -237,9 +244,12 @@ TEST_F(JsAutofillManagerTest, FillActiveFormField) {
   NSString* focus_element_javascript =
       [NSString stringWithFormat:@"%@.focus()", get_element_javascript];
   ExecuteJavaScript(focus_element_javascript);
-  [manager_ fillActiveFormField:
-                @"{\"name\":\"email\",\"identifier\":\"email\",\"value\":"
-                @"\"newemail@com\"}"
+  auto data = std::make_unique<base::DictionaryValue>();
+  data->SetString("name", "email");
+  data->SetString("identifier", "email");
+  data->SetString("value", "newemail@com");
+  [manager_ fillActiveFormField:std::move(data)
+                        inFrame:web::GetMainWebFrame(web_state())
               completionHandler:^{
               }];
 
@@ -262,12 +272,14 @@ TEST_F(JsAutofillManagerTest, TestExtractedFieldsNames) {
 
   __block BOOL block_was_called = NO;
   __block NSString* result;
-  [manager_ fetchFormsWithMinimumRequiredFieldsCount:
-                autofill::MinRequiredFieldsForHeuristics()
-                                   completionHandler:^(NSString* actualResult) {
-                                     block_was_called = YES;
-                                     result = [actualResult copy];
-                                   }];
+  [manager_
+      fetchFormsWithMinimumRequiredFieldsCount:
+          autofill::MinRequiredFieldsForHeuristics()
+                                       inFrame:web::GetMainWebFrame(web_state())
+                             completionHandler:^(NSString* actualResult) {
+                               block_was_called = YES;
+                               result = [actualResult copy];
+                             }];
   base::test::ios::WaitUntilCondition(^bool() {
     return block_was_called;
   });
@@ -331,12 +343,14 @@ TEST_F(JsAutofillManagerTest, TestExtractedFieldsIDs) {
 
   __block BOOL block_was_called = NO;
   __block NSString* result;
-  [manager_ fetchFormsWithMinimumRequiredFieldsCount:
-                autofill::MinRequiredFieldsForHeuristics()
-                                   completionHandler:^(NSString* actualResult) {
-                                     block_was_called = YES;
-                                     result = [actualResult copy];
-                                   }];
+  [manager_
+      fetchFormsWithMinimumRequiredFieldsCount:
+          autofill::MinRequiredFieldsForHeuristics()
+                                       inFrame:web::GetMainWebFrame(web_state())
+                             completionHandler:^(NSString* actualResult) {
+                               block_was_called = YES;
+                               result = [actualResult copy];
+                             }];
   base::test::ios::WaitUntilCondition(^bool() {
     return block_was_called;
   });

ios/web_view/internal/autofill/cwv_autofill_controller.mm

@@ -133,9 +133,13 @@
 
 - (void)clearFormWithName:(NSString*)formName
           fieldIdentifier:(NSString*)fieldIdentifier
+                  frameID:(NSString*)frameID
         completionHandler:(nullable void (^)(void))completionHandler {
+  web::WebFrame* frame =
+      web::GetWebFrameWithId(_webState, base::SysNSStringToUTF8(frameID));
   [_JSAutofillManager clearAutofilledFieldsForFormName:formName
                                        fieldIdentifier:fieldIdentifier
+                                               inFrame:frame
                                      completionHandler:^{
                                        if (completionHandler) {
                                          completionHandler();
@@ -352,7 +356,7 @@ showUnmaskPromptForCard:(const autofill::CreditCard&)creditCard
 - (void)onFormDataFilled:(uint16_t)query_id
                  inFrame:(web::WebFrame*)frame
                   result:(const autofill::FormData&)result {
-  [_autofillAgent onFormDataFilled:result];
+  [_autofillAgent onFormDataFilled:result inFrame:frame];
   autofill::AutofillManager* manager = [self autofillManagerForFrame:frame];
   if (manager) {
     manager->OnDidFillAutofillFormData(result, base::TimeTicks::Now());

ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm

@@ -157,9 +157,13 @@ TEST_F(CWVAutofillControllerTest, FillSuggestion) {
 
 // Tests CWVAutofillController clears form.
 TEST_F(CWVAutofillControllerTest, ClearForm) {
+  auto frame = std::make_unique<web::FakeWebFrame>(
+      base::SysNSStringToUTF8(kTestFrameId), true, GURL::EmptyGURL());
+  web_state_.AddWebFrame(std::move(frame));
   __block BOOL clear_form_completion_was_called = NO;
   [autofill_controller_ clearFormWithName:kTestFormName
                           fieldIdentifier:kTestFieldIdentifier
+                                  frameID:kTestFrameId
                         completionHandler:^{
                           clear_form_completion_was_called = YES;
                         }];
@@ -171,6 +175,7 @@ TEST_F(CWVAutofillControllerTest, ClearForm) {
   EXPECT_NSEQ(kTestFormName, js_autofill_manager_.lastClearedFormName);
   EXPECT_NSEQ(kTestFieldIdentifier,
               js_autofill_manager_.lastClearedFieldIdentifier);
+  EXPECT_NSEQ(kTestFrameId, js_autofill_manager_.lastClearedFrameIdentifier);
 }
 
 // Tests CWVAutofillController focus previous field.

ios/web_view/public/cwv_autofill_controller.h

@@ -25,7 +25,8 @@ CWV_EXPORT
 - (instancetype)init NS_UNAVAILABLE;
 
 // Clears the fields that belong to the same autofill section as the field
-// identified by |fieldIdentifier| in the form named |formName|.
+// identified by |fieldIdentifier| in the form named |formName| in frame
+// |frameID|.
 // No-op if no such form can be found in the current page. If the field
 // identified by |fieldIdentifier| cannot be found the entire form gets cleared.
 // |fieldIdentifier| identifies the field that had focus. It is passed to
@@ -33,6 +34,7 @@ CWV_EXPORT
 // |completionHandler| will only be called on success.
 - (void)clearFormWithName:(NSString*)formName
           fieldIdentifier:(NSString*)fieldIdentifier
+                  frameID:(NSString*)frameID
         completionHandler:(nullable void (^)(void))completionHandler;
 
 // For the field named |fieldName|, identified by |fieldIdentifier| in the form

ios/web_view/shell/shell_autofill_delegate.m

@@ -71,6 +71,7 @@
                 handler:^(UIAlertAction* _Nonnull action) {
                   [autofillController clearFormWithName:formName
                                         fieldIdentifier:fieldIdentifier
+                                                frameID:frameID
                                       completionHandler:nil];
                 }];
     [alertController addAction:clearAction];

ios/web_view/test/web_view_autofill_inttest.mm

@@ -210,6 +210,7 @@ TEST_F(WebViewAutofillTest, TestSuggestionFetchFillClear) {
   ASSERT_NSEQ(nil, filled_error);
   [autofill_controller_ clearFormWithName:kTestFormName
                           fieldIdentifier:kTestFieldID
+                                  frameID:kTestFrameID
                         completionHandler:nil];
   NSString* cleared_script = [NSString
       stringWithFormat:@"document.getElementById('%@').value", kTestFieldID];