Split up ios/web:test_support.

ios/chrome/browser/ui/history/tab_history_popup_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.
 
 #import <XCTest/XCTest.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.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"
-#import "ios/web/public/test/http_server_util.h"
+#import "ios/web/public/test/http_server/http_server.h"
+#import "ios/web/public/test/http_server/http_server_util.h"
 #include "ios/web/public/test/url_test_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 // Tests for tab history popup.
 @interface TabHistoryPopupControllerTestCase : ChromeTestCase
 @end
 
@@ skipping 65 matching lines @@
       assertWithMatcher:grey_notNil()];
   // Tap entry to go forward 2 pages, and verify that entry 3 is loaded.
   [[EarlGrey selectElementWithMatcher:grey_text(entry3)]
       performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:chrome_test_util::OmniboxText(URL3.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 @end