diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 04:29:17 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 04:29:17 +0000 |
| commit | 3d96893747d18a3c1bf06084d4605a4b34af732f (patch) | |
| tree | 9347442c4dd581ab825ed22cddc082e6119000e4 /webkit/glue/dom_operations_unittest.cc | |
| parent | 47b0ee174aa53dd1fd473bafae35166538f57a68 (diff) | |
| download | chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.zip chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.tar.gz chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.tar.bz2 | |
Hook up WebFrameClient, replacing many WebViewDelegate methods.
Moved NavigationGesture out of webview_delegate.h into its own
header in chrome/common since it is only needed by Chrome.
Adds WebFrame::isProcessingUserGesture to facilitate the removal
of NavigationGesture.
Cleaned up some TestShell methods related to URL loading. The
method to load an URL now takes a GURL instead of a wchar_t*.
R=dglazkov
BUG=21332
TEST=none
Review URL: http://codereview.chromium.org/200054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_operations_unittest.cc')
| -rw-r--r-- | webkit/glue/dom_operations_unittest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/glue/dom_operations_unittest.cc b/webkit/glue/dom_operations_unittest.cc index 4d6fb86..b5487b2 100644 --- a/webkit/glue/dom_operations_unittest.cc +++ b/webkit/glue/dom_operations_unittest.cc @@ -41,8 +41,7 @@ void DomOperationsTests::GetSavableResourceLinksForPage( GURL file_url = net::FilePathToFileURL(page_file_path); // Load the test file. test_shell_->ResetTestController(); - std::wstring file_wurl = ASCIIToWide(file_url.spec()); - test_shell_->LoadURL(file_wurl.c_str()); + test_shell_->LoadURL(file_url); test_shell_->WaitTestFinished(); // Get all savable resource links for the page. std::vector<GURL> resources_list; @@ -52,9 +51,8 @@ void DomOperationsTests::GetSavableResourceLinksForPage( &referrers_list, &frames_list); - GURL main_page_gurl(WideToUTF8(file_wurl)); ASSERT_TRUE(webkit_glue::GetAllSavableResourceLinksForCurrentPage( - test_shell_->webView(), main_page_gurl, &result)); + test_shell_->webView(), file_url, &result)); // Check all links of sub-resource for (std::vector<GURL>::const_iterator cit = resources_list.begin(); cit != resources_list.end(); ++cit) { |