Split up ios/web:test_support.

ios/chrome/browser/ui/browser_view_controller_egtest.mm

 // Copyright 2016 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.
 
 #include <map>
 
 #import <EarlGrey/EarlGrey.h>
 #import <WebKit/WebKit.h>
 #import <XCTest/XCTest.h>
 
 #include "base/ios/ios_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
-#import "ios/web/public/test/http_server.h"
-#include "ios/web/public/test/http_server_util.h"
-#include "ios/web/public/test/response_providers/html_response_provider.h"
+#include "ios/web/public/test/http_server/html_response_provider.h"
+#import "ios/web/public/test/http_server/http_server.h"
+#include "ios/web/public/test/http_server/http_server_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 // This test suite only tests javascript in the omnibox. Nothing to do with BVC
 // really, the name is a bit misleading.
 @interface BrowserViewControllerTestCase : ChromeTestCase
 @end
@@ skipping 49 matching lines @@
                   @"Did not navigate to the destination url.");
 
   // Verifies that the destination page is shown.
   id<GREYMatcher> navigationMatcher =
       chrome_test_util::WebViewContainingText(responses[destinationURL]);
   [[EarlGrey selectElementWithMatcher:grey_kindOfClass([WKWebView class])]
       assertWithMatcher:navigationMatcher];
 }
 
 @end