chrome/test/base/ui_test_utils.cc - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

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

Unified Diff: chrome/test/base/ui_test_utils.cc

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 12 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/test/base/test_html_dialog_observer.cc ('k') | content/browser/renderer_host/test_render_view_host.h » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/ui_test_utils.cc

===================================================================

--- chrome/test/base/ui_test_utils.cc (revision 116232)

+++ chrome/test/base/ui_test_utils.cc (working copy)

@@ -44,10 +44,10 @@

#include "chrome/test/automation/javascript_execution_controller.h"

#include "chrome/test/base/bookmark_load_observer.h"

#include "content/browser/renderer_host/render_view_host.h"

-#include "content/browser/tab_contents/navigation_controller.h"

#include "content/browser/tab_contents/tab_contents.h"

#include "content/public/browser/download_item.h"

#include "content/public/browser/download_manager.h"

+#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/render_process_host.h"

@@ -314,7 +314,7 @@

return true;

}

-void WaitForNavigations(NavigationController* controller,

+void WaitForNavigations(content::NavigationController* controller,

int number_of_navigations) {

TestNavigationObserver observer(

content::Source<content::NavigationController>(controller), NULL,

@@ -450,7 +450,7 @@

base::Unretained(MessageLoopForUI::current())));

return;

} else if (web_contents) {

- NavigationController* controller = &web_contents->GetController();

+ content::NavigationController* controller = &web_contents->GetController();

WaitForNavigations(controller, number_of_navigations);

return;

}