| Index: ios/web/public/test/navigation_test_util.mm
|
| diff --git a/ios/web/shell/test/navigation_test_util.mm b/ios/web/public/test/navigation_test_util.mm
|
| similarity index 60%
|
| rename from ios/web/shell/test/navigation_test_util.mm
|
| rename to ios/web/public/test/navigation_test_util.mm
|
| index a306ad242514e33d9a89f3b41ec21229d7466da4..a1046485dc1344de8624eb54bf96e201ca25add0 100644
|
| --- a/ios/web/shell/test/navigation_test_util.mm
|
| +++ b/ios/web/public/test/navigation_test_util.mm
|
| @@ -2,11 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ios/web/shell/test/navigation_test_util.h"
|
| +#include "ios/web/public/test/navigation_test_util.h"
|
|
|
| #import "ios/web/public/navigation_manager.h"
|
| -#import "ios/web/public/web_state/web_state.h"
|
| -#import "ios/web/shell/test/web_shell_test_util.h"
|
|
|
| using web::NavigationManager;
|
|
|
| @@ -15,12 +13,8 @@ namespace navigation_test_util {
|
| // TODO(crbug.com/604902): Refactor these utilities into objects that can be
|
| // shared accross the web shell and Chrome.
|
|
|
| -void LoadUrl(GURL url) {
|
| - ViewController* view_controller =
|
| - web::web_shell_test_util::GetCurrentViewController();
|
| -
|
| - NavigationManager* navigation_manager =
|
| - [view_controller webState]->GetNavigationManager();
|
| +void LoadUrl(web::WebState* web_state, GURL url) {
|
| + NavigationManager* navigation_manager = web_state->GetNavigationManager();
|
| NavigationManager::WebLoadParams params(url);
|
| params.transition_type = ui::PAGE_TRANSITION_TYPED;
|
| navigation_manager->LoadURLWithParams(params);
|
|
|