ios/web/public/test/navigation_test_util.mm - Issue 1950323002: Refactor web shell integration tests utilities.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ios/web/public/test/navigation_test_util.mm

Issue 1950323002: Refactor web shell integration tests utilities. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: alphabetize Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« ios/web/public/test/earl_grey/web_view_matchers.mm ('K') | « ios/web/public/test/navigation_test_util.h ('k') | ios/web/shell/test/app/web_shell_test_util.h » ('j') | ios/web/shell/test/app/web_shell_test_util.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ios/web/shell/test/navigation_test_util.h"	5 #include "ios/web/public/test/navigation_test_util.h"

6	6

7 #import "ios/web/public/navigation_manager.h"	7 #import "ios/web/public/navigation_manager.h"

8 #import "ios/web/public/web_state/web_state.h"

9 #import "ios/web/shell/test/web_shell_test_util.h"

10	8

11 using web::NavigationManager;	9 using web::NavigationManager;

12	10

13 namespace web {	11 namespace web {

14 namespace navigation_test_util {	12 namespace navigation_test_util {

15 // TODO(crbug.com/604902): Refactor these utilities into objects that can be	13 // TODO(crbug.com/604902): Refactor these utilities into objects that can be
	Eugene But (OOO till 7-30) 2016/05/05 18:01:11 Seems like you can now delete this comment Seems like you can now delete this comment baxley 2016/05/05 21:13:53 Done. Show quoted text On 2016/05/05 18:01:11, Eugene But wrote: > Seems like you can now delete this comment Done.
16 // shared accross the web shell and Chrome.	14 // shared accross the web shell and Chrome.

17	15

18 void LoadUrl(GURL url) {	16 void LoadUrl(web::WebState* web_state, GURL url) {

19 ViewController* view_controller =	17 NavigationManager* navigation_manager = web_state->GetNavigationManager();

20 web::web_shell_test_util::GetCurrentViewController();

21

22 NavigationManager* navigation_manager =

23 [view_controller webState]->GetNavigationManager();

24 NavigationManager::WebLoadParams params(url);	18 NavigationManager::WebLoadParams params(url);

25 params.transition_type = ui::PAGE_TRANSITION_TYPED;	19 params.transition_type = ui::PAGE_TRANSITION_TYPED;

26 navigation_manager->LoadURLWithParams(params);	20 navigation_manager->LoadURLWithParams(params);

27 }	21 }

28	22

29 } // namespace navigation_test_util	23 } // namespace navigation_test_util

30 } // namespace web	24 } // namespace web

OLD	NEW