diff options
| author | asanka@chromium.org <asanka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 16:49:24 +0000 |
|---|---|---|
| committer | asanka@chromium.org <asanka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 16:49:24 +0000 |
| commit | 35aaff4248618afd4d2a5fc7ab728bc5a9bcddd9 (patch) | |
| tree | f9dc308d7954a0c548408c6b4bb978c4d1b9a379 /chrome/test/ui_test_utils.cc | |
| parent | 0a9539c61ca3848f30c91056626860a0825db958 (diff) | |
| download | chromium_src-35aaff4248618afd4d2a5fc7ab728bc5a9bcddd9.zip chromium_src-35aaff4248618afd4d2a5fc7ab728bc5a9bcddd9.tar.gz chromium_src-35aaff4248618afd4d2a5fc7ab728bc5a9bcddd9.tar.bz2 | |
Add '?' to the list of characters escaped when constructing a file:// URL
BUG=83514
TEST=net_unittests --gtest_filter=NetUtilTest.FileURLConversion
Review URL: http://codereview.chromium.org/6990038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 77ce4ff..f6a90d2 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -537,6 +537,17 @@ GURL GetTestUrl(const FilePath& dir, const FilePath& file) { return net::FilePathToFileURL(GetTestFilePath(dir, file)); } +GURL GetFileUrlWithQuery(const FilePath& path, + const std::string& query_string) { + GURL url = net::FilePathToFileURL(path); + if (!query_string.empty()) { + GURL::Replacements replacements; + replacements.SetQueryStr(query_string); + return url.ReplaceComponents(replacements); + } + return url; +} + AppModalDialog* WaitForAppModalDialog() { TestNotificationObserver observer; RegisterAndWait(&observer, NotificationType::APP_MODAL_DIALOG_SHOWN, |