diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 18:03:25 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 18:03:25 +0000 |
| commit | e1cd545683ab636f51e6dc97855065b5dc7388fa (patch) | |
| tree | 7aaea17938983f6b366596f02ff43212835f9b94 /chrome/browser/tab_contents/test_tab_contents.cc | |
| parent | e9c5370175e6a32c55a09fefd739faa4192f366b (diff) | |
| download | chromium_src-e1cd545683ab636f51e6dc97855065b5dc7388fa.zip chromium_src-e1cd545683ab636f51e6dc97855065b5dc7388fa.tar.gz chromium_src-e1cd545683ab636f51e6dc97855065b5dc7388fa.tar.bz2 | |
Adds NavigationController::CopyStateFromAndPrune which merges two
NavigationControllers.
BUG=none
TEST=covered by unit tests.
Review URL: http://codereview.chromium.org/3176030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/test_tab_contents.cc')
| -rw-r--r-- | chrome/browser/tab_contents/test_tab_contents.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/test_tab_contents.cc b/chrome/browser/tab_contents/test_tab_contents.cc index 5ed4820..54a6873 100644 --- a/chrome/browser/tab_contents/test_tab_contents.cc +++ b/chrome/browser/tab_contents/test_tab_contents.cc @@ -4,6 +4,8 @@ #include "chrome/browser/tab_contents/test_tab_contents.h" +#include "chrome/browser/browser_url_handler.h" +#include "chrome/browser/renderer_host/mock_render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" @@ -61,3 +63,14 @@ TabContents* TestTabContents::Clone() { tc->controller().CopyStateFrom(controller_); return tc; } + +void TestTabContents::NavigateAndCommit(const GURL& url) { + controller().LoadURL(url, GURL(), 0); + GURL loaded_url(url); + bool reverse_on_redirect = false; + BrowserURLHandler::RewriteURLIfNecessary( + &loaded_url, profile(), &reverse_on_redirect); + static_cast<TestRenderViewHost*>(render_view_host())->SendNavigate( + static_cast<MockRenderProcessHost*>(render_view_host()->process())-> + max_page_id() + 1, loaded_url); +} |