Consolidated all CWVWebView test helpers inside web_view_test_util file.

ios/web_view/test/chrome_web_view_test.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 "ios/web_view/test/chrome_web_view_test.h"
 
 #import <ChromeWebView/ChromeWebView.h>
 #import <Foundation/Foundation.h>
 
 #include "base/base64.h"
 #import "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #import "ios/testing/wait_util.h"

[michaeldo, 2017/06/15 15:43:08]

Remove wait_util.h import

[Eugene But (OOO till 7-30), 2017/06/16 01:52:23]

Good catch. Done.

 #import "ios/web_view/test/web_view_test_util.h"
 #include "net/base/url_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
@@ skipping 102 matching lines @@
   // Encode |title| and |body| in url query in order to build the server
   // response later in TestRequestHandler.
   std::string encoded_title = EncodeQueryParamValue(title);
   url = net::AppendQueryParameter(url, kPageHtmlTitleParamName, encoded_title);
   std::string encoded_body = EncodeQueryParamValue(body);
   url = net::AppendQueryParameter(url, kPageHtmlBodyParamName, encoded_body);
 
   return url;
 }
 
-void ChromeWebViewTest::LoadUrl(CWVWebView* web_view, NSURL* url) {
-  [web_view loadRequest:[NSURLRequest requestWithURL:url]];
-
-  WaitForPageLoadCompletion(web_view);
-}
-
-void ChromeWebViewTest::WaitForPageLoadCompletion(CWVWebView* web_view) {
-  BOOL success =
-      testing::WaitUntilConditionOrTimeout(testing::kWaitForPageLoadTimeout, ^{
-        return !web_view.isLoading;
-      });
-  ASSERT_TRUE(success);
-}
-
 }  // namespace ios_web_view