Fix tests with WebFrame messaging

These are fixes that are needed to enable Autofill in iframes.
It also add more tests for the frame messaging logic.

Bug: 881364
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Iea417c1d371094489daca66e7477d963d003c716
Reviewed-on: https://chromium-review.googlesource.com/1234333
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@{#593282}

ios/chrome/browser/autofill/autofill_controller_unittest.mm

@@ -13,6 +13,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/task_scheduler/task_scheduler.h"
+#import "base/test/ios/wait_util.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
@@ -181,6 +182,10 @@ class AutofillControllerTest : public ChromeWebTest {
   // |retrieveSuggestionsForForm| to avoid considering a former call.
   void WaitForSuggestionRetrieval(BOOL wait_for_trigger);
 
+  // Blocks until |expected_size| forms have been fecthed.
+  bool WaitForFormFetched(AutofillManager* manager,
+                          size_t expected_size) WARN_UNUSED_RESULT;
+
   // Fails if the specified metric was not registered the given number of times.
   void ExpectMetric(const std::string& histogram_name, int sum);
 
@@ -265,6 +270,14 @@ void AutofillControllerTest::WaitForSuggestionRetrieval(BOOL wait_for_trigger) {
   });
 }
 
+bool AutofillControllerTest::WaitForFormFetched(AutofillManager* manager,
+                                                size_t expected_size) {
+  return base::test::ios::WaitUntilConditionOrTimeout(
+      base::test::ios::kWaitForPageLoadTimeout, ^bool {
+        return manager->form_structures().size() == expected_size;
+      });
+}
+
 void AutofillControllerTest::ExpectMetric(const std::string& histogram_name,
                                           int sum) {
   histogram_tester_->ExpectBucketCount(histogram_name, sum, 1);
@@ -283,8 +296,8 @@ TEST_F(AutofillControllerTest, ReadForm) {
   AutofillManager* autofill_manager =
       AutofillDriverIOS::FromWebStateAndWebFrame(web_state(), main_frame)
           ->autofill_manager();
+  EXPECT_TRUE(WaitForFormFetched(autofill_manager, 1));
   const auto& forms = autofill_manager->form_structures();
-  ASSERT_EQ(1U, forms.size());
   const auto& form = *(forms.begin()->second);
   CheckField(form, NAME_FULL, "name_1");
   CheckField(form, ADDRESS_HOME_LINE1, "address_1");
@@ -304,8 +317,8 @@ TEST_F(AutofillControllerTest, ReadFormName) {
   AutofillManager* autofill_manager =
       AutofillDriverIOS::FromWebStateAndWebFrame(web_state(), main_frame)
           ->autofill_manager();
+  EXPECT_TRUE(WaitForFormFetched(autofill_manager, 1));
   const auto& forms = autofill_manager->form_structures();
-  ASSERT_EQ(1U, forms.size());
   const auto& form = *(forms.begin()->second);
   EXPECT_EQ(base::UTF8ToUTF16("form1"), form.ToFormData().name);
 };

ios/chrome/browser/autofill/form_structure_browsertest.mm

@@ -19,6 +19,7 @@
 #include "components/autofill/core/common/autofill_features.h"
 #import "components/autofill/ios/browser/autofill_agent.h"
 #include "components/autofill/ios/browser/autofill_driver_ios.h"
+#include "ios/chrome/browser/autofill/address_normalizer_factory.h"
 #import "ios/chrome/browser/autofill/autofill_controller.h"
 #import "ios/chrome/browser/autofill/form_suggestion_controller.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
@@ -136,6 +137,10 @@ FormStructureBrowserTest::FormStructureBrowserTest()
 void FormStructureBrowserTest::SetUp() {
   ChromeWebTest::SetUp();
 
+  // AddressNormalizerFactory must be initialized in a blocking allowed scoped.
+  // Initialize it now as it may DCHECK if it is initialized during the test.
+  AddressNormalizerFactory::GetInstance();
+
   IOSSecurityStateTabHelper::CreateForWebState(web_state());
   InfoBarManagerImpl::CreateForWebState(web_state());
   AutofillAgent* autofillAgent = [[AutofillAgent alloc]

ios/chrome/browser/autofill/js_autofill_manager_unittest.mm

@@ -248,11 +248,16 @@ TEST_F(JsAutofillManagerTest, FillActiveFormField) {
   data->SetString("name", "email");
   data->SetString("identifier", "email");
   data->SetString("value", "newemail@com");
+  __block BOOL block_was_called = NO;
   [manager_ fillActiveFormField:std::move(data)
                         inFrame:web::GetMainWebFrame(web_state())
               completionHandler:^{
+                block_was_called = YES;
               }];
-
+  EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
+      base::test::ios::kWaitForActionTimeout, ^bool() {
+        return block_was_called;
+      }));
   NSString* element_value_javascript =
       [NSString stringWithFormat:@"%@.value", get_element_javascript];
   EXPECT_NSEQ(@"newemail@com", ExecuteJavaScript(element_value_javascript));

ios/chrome/browser/web/visible_url_egtest.mm

@@ -19,6 +19,7 @@
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
+#import "ios/web/public/features.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/test/http_server/html_response_provider.h"
 #import "ios/web/public/test/http_server/http_server.h"
@@ -560,9 +561,18 @@ class PausableResponseProvider : public HtmlResponseProvider {
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [ChromeEarlGrey waitForWebViewContainingText:kTestPage1];
-  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
-      assertWithMatcher:grey_notNil()];
+  if (base::FeatureList::IsEnabled(web::features::kWebFrameMessaging)) {
+    // With frame messaging, only one back is executed. This is the expected
+    // behavior.
+    [ChromeEarlGrey waitForWebViewContainingText:kTestPage2];
+    [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
+        assertWithMatcher:grey_notNil()];
+  } else {
+    // TODO(crbug.com/866406): fix the test to have documented behavior.
+    [ChromeEarlGrey waitForWebViewContainingText:kTestPage1];
+    [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
+        assertWithMatcher:grey_notNil()];
+  }
 }
 
 #pragma mark -

ios/web/public/test/fakes/fake_web_frame.cc

@@ -5,6 +5,8 @@
 #include "ios/web/public/test/fakes/fake_web_frame.h"
 
 #include "base/callback.h"
+#include "base/json/json_writer.h"
+#include "base/values.h"
 
 namespace web {
 FakeWebFrame::FakeWebFrame(const std::string& frame_id,
@@ -32,6 +34,18 @@ bool FakeWebFrame::CanCallJavaScriptFunction() const {
 bool FakeWebFrame::CallJavaScriptFunction(
     const std::string& name,
     const std::vector<base::Value>& parameters) {
+  last_javascript_call_ = std::string("__gCrWeb." + name + "(");
+  bool first = true;
+  for (auto& param : parameters) {
+    if (!first) {
+      last_javascript_call_ += ", ";
+    }
+    first = false;
+    std::string paramString;
+    base::JSONWriter::Write(param, &paramString);
+    last_javascript_call_ += paramString;
+  }
+  last_javascript_call_ += ");";
   return false;
 }
 
@@ -40,7 +54,7 @@ bool FakeWebFrame::CallJavaScriptFunction(
     const std::vector<base::Value>& parameters,
     base::OnceCallback<void(const base::Value*)> callback,
     base::TimeDelta timeout) {
-  return false;
+  return CallJavaScriptFunction(name, parameters);
 }
 
 }  // namespace web

ios/web/public/test/fakes/fake_web_frame.h

@@ -31,6 +31,7 @@ class FakeWebFrame : public WebFrame {
       const std::vector<base::Value>& parameters,
       base::OnceCallback<void(const base::Value*)> callback,
       base::TimeDelta timeout) override;
+  std::string last_javascript_call() { return last_javascript_call_; }
 
  private:
   // The frame identifier which uniquely identifies this frame across the
@@ -40,6 +41,8 @@ class FakeWebFrame : public WebFrame {
   bool is_main_frame_ = false;
   // The security origin associated with this frame.
   GURL security_origin_;
+  // The last Javascript script that was called, converted as a string.
+  std::string last_javascript_call_;
 };
 
 }  // namespace web

ios/web_view/test/web_view_autofill_inttest.mm

@@ -30,7 +30,6 @@ NSString* const kTestFormName = @"FormName";
 NSString* const kTestFormID = @"FormID";
 NSString* const kTestFieldName = @"FieldName";
 NSString* const kTestFieldID = @"FieldID";
-NSString* const kTestFrameID = @"FrameID";
 NSString* const kTestFieldValue = @"FieldValue";
 NSString* const kTestSubmitID = @"SubmitID";
 NSString* const kTestFormHtml =
@@ -223,7 +222,7 @@ TEST_F(WebViewAutofillTest, TestSuggestionFetchFillClear) {
   ASSERT_NSEQ(nil, filled_error);
   [autofill_controller_ clearFormWithName:kTestFormName
                           fieldIdentifier:kTestFieldID
-                                  frameID:kTestFrameID
+                                  frameID:GetMainFrameId()
                         completionHandler:nil];
   NSString* cleared_script = [NSString
       stringWithFormat:@"document.getElementById('%@').value", kTestFieldID];