Consolidated all CWVWebView test helpers inside web_view_test_util file.

ios/web_view/test/chrome_web_view_kvo_inttest.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <ChromeWebView/ChromeWebView.h>
 #import <Foundation/Foundation.h>
 
 #include "base/strings/stringprintf.h"
 #import "base/strings/sys_string_conversions.h"
 #import "ios/testing/wait_util.h"
@@ skipping 29 matching lines @@
   GURL page_3_url = GetUrlForPageWithTitle("Page 3");
 
   std::string page_2_html =
       "<a id='link_2' href='" + page_3_url.spec() + "'>Link 2</a>";
   GURL page_2_url = GetUrlForPageWithHtmlBody(page_2_html);
 
   std::string page_1_html =
       "<a id='link_1' href='" + page_2_url.spec() + "'>Link 1</a>";
   GURL page_1_url = GetUrlForPageWithHtmlBody(page_1_html);
 
-  LoadUrl(web_view_, net::NSURLWithGURL(page_1_url));
+  ASSERT_TRUE(test::LoadUrl(web_view_, net::NSURLWithGURL(page_1_url)));
   // Loading initial URL should not affect back/forward navigation state.
   EXPECT_FALSE([back_observer.lastValue boolValue]);
   EXPECT_FALSE([forward_observer.lastValue boolValue]);
 
   // Navigate to page 2.
-  EXPECT_TRUE(test::TapChromeWebViewElementWithId(web_view_, @"link_1"));
-  WaitForPageLoadCompletion(web_view_);
+  EXPECT_TRUE(test::TapWebViewElementWithId(web_view_, @"link_1"));
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_TRUE([back_observer.lastValue boolValue]);
   EXPECT_FALSE([forward_observer.lastValue boolValue]);
 
   // Navigate back to page 1.
   [web_view_ goBack];
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_FALSE([back_observer.lastValue boolValue]);
   EXPECT_TRUE([forward_observer.lastValue boolValue]);
 
   // Navigate forward to page 2.
   [web_view_ goForward];
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_TRUE([back_observer.lastValue boolValue]);
   EXPECT_FALSE([forward_observer.lastValue boolValue]);
 
   // Navigate to page 3.
-  EXPECT_TRUE(test::TapChromeWebViewElementWithId(web_view_, @"link_2"));
-  WaitForPageLoadCompletion(web_view_);
+  EXPECT_TRUE(test::TapWebViewElementWithId(web_view_, @"link_2"));
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_TRUE([back_observer.lastValue boolValue]);
   EXPECT_FALSE([forward_observer.lastValue boolValue]);
 
   // Navigate back to page 2.
   [web_view_ goBack];
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_TRUE([back_observer.lastValue boolValue]);
   EXPECT_TRUE([forward_observer.lastValue boolValue]);
 }
 
 // Tests that CWVWebView correctly reports current |title|.
 TEST_F(ChromeWebViewKvoTest, Title) {
   Observer* observer = [[Observer alloc] init];
   [observer setObservedObject:web_view_ keyPath:@"title"];
 
   NSString* page_2_title = @"Page 2";
   GURL page_2_url =
       GetUrlForPageWithTitle(base::SysNSStringToUTF8(page_2_title));
 
   NSString* page_1_title = @"Page 1";
   std::string page_1_html = base::StringPrintf(
       "<a id='link_1' href='%s'>Link 1</a>", page_2_url.spec().c_str());
   GURL page_1_url = GetUrlForPageWithTitleAndBody(
       base::SysNSStringToUTF8(page_1_title), page_1_html);
 
-  LoadUrl(web_view_, net::NSURLWithGURL(page_1_url));
+  ASSERT_TRUE(test::LoadUrl(web_view_, net::NSURLWithGURL(page_1_url)));
   EXPECT_NSEQ(page_1_title, observer.lastValue);
 
   // Navigate to page 2.
-  EXPECT_TRUE(test::TapChromeWebViewElementWithId(web_view_, @"link_1"));
-  WaitForPageLoadCompletion(web_view_);
+  EXPECT_TRUE(test::TapWebViewElementWithId(web_view_, @"link_1"));
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_NSEQ(page_2_title, observer.lastValue);
 
   // Navigate back to page 1.
   [web_view_ goBack];
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_NSEQ(page_1_title, observer.lastValue);
 }
 
 // Tests that CWVWebView correctly reports |isLoading| value.
 TEST_F(ChromeWebViewKvoTest, Loading) {
   Observer* observer = [[Observer alloc] init];
   [observer setObservedObject:web_view_ keyPath:@"loading"];
 
   GURL page_2_url = GetUrlForPageWithTitle("Page 2");
 
   std::string page_1_html = base::StringPrintf(
       "<a id='link_1' href='%s'>Link 1</a>", page_2_url.spec().c_str());
   GURL page_1_url = GetUrlForPageWithTitleAndBody("Page 1", page_1_html);
 
-  LoadUrl(web_view_, net::NSURLWithGURL(page_1_url));
+  ASSERT_TRUE(test::LoadUrl(web_view_, net::NSURLWithGURL(page_1_url)));
   EXPECT_TRUE([observer.previousValue boolValue]);
   EXPECT_FALSE([observer.lastValue boolValue]);
 
   // Navigate to page 2.
-  EXPECT_TRUE(test::TapChromeWebViewElementWithId(web_view_, @"link_1"));
-  WaitForPageLoadCompletion(web_view_);
+  EXPECT_TRUE(test::TapWebViewElementWithId(web_view_, @"link_1"));
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_TRUE([observer.previousValue boolValue]);
   EXPECT_FALSE([observer.lastValue boolValue]);
 
   // Navigate back to page 1.
   [web_view_ goBack];
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_TRUE([observer.previousValue boolValue]);
   EXPECT_FALSE([observer.lastValue boolValue]);
 }
 
 // Tests that CWVWebView correctly reports |visibleURL| and |lastCommittedURL|.
 TEST_F(ChromeWebViewKvoTest, URLs) {
   Observer* last_committed_url_observer = [[Observer alloc] init];
   [last_committed_url_observer setObservedObject:web_view_
                                          keyPath:@"lastCommittedURL"];
 
   Observer* visible_url_observer = [[Observer alloc] init];
   [visible_url_observer setObservedObject:web_view_ keyPath:@"visibleURL"];
 
   GURL page_2 = GetUrlForPageWithTitle("Page 2");
   NSURL* page_2_url = net::NSURLWithGURL(page_2);
 
   std::string page_1_html = base::StringPrintf(
       "<a id='link_1' href='%s'>Link 1</a>", page_2.spec().c_str());
   NSURL* page_1_url =
       net::NSURLWithGURL(GetUrlForPageWithTitleAndBody("Page 1", page_1_html));
 
   [web_view_ loadRequest:[NSURLRequest requestWithURL:page_1_url]];
 
   // |visibleURL| will update immediately
   EXPECT_NSEQ(page_1_url, visible_url_observer.lastValue);
 
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_NSEQ(page_1_url, last_committed_url_observer.lastValue);
   EXPECT_NSEQ(page_1_url, visible_url_observer.lastValue);
 
   // Navigate to page 2.
-  EXPECT_TRUE(test::TapChromeWebViewElementWithId(web_view_, @"link_1"));
-  WaitForPageLoadCompletion(web_view_);
+  EXPECT_TRUE(test::TapWebViewElementWithId(web_view_, @"link_1"));
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_NSEQ(page_2_url, last_committed_url_observer.lastValue);
   EXPECT_NSEQ(page_2_url, visible_url_observer.lastValue);
 
   // Navigate back to page 1.
   [web_view_ goBack];
-  WaitForPageLoadCompletion(web_view_);
+  ASSERT_TRUE(test::WaitForWebViewLoadCompletionOrTimeout(web_view_));
   EXPECT_NSEQ(page_1_url, last_committed_url_observer.lastValue);
   EXPECT_NSEQ(page_1_url, visible_url_observer.lastValue);
 }
 
 }  // namespace ios_web_view