summaryrefslogtreecommitdiffstats
path: root/chrome/test/plugin
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:32:19 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:32:19 +0000
commit158a0892d261b8c717f2bc92bec4649898e4da96 (patch)
treea9ffd69181f6798160a59384d2e6088771364c29 /chrome/test/plugin
parent866ba3fc1097334050b59b919e12e11314f2965d (diff)
downloadchromium_src-158a0892d261b8c717f2bc92bec4649898e4da96.zip
chromium_src-158a0892d261b8c717f2bc92bec4649898e4da96.tar.gz
chromium_src-158a0892d261b8c717f2bc92bec4649898e4da96.tar.bz2
Use FilePath in URLRequestMocks.
BUG=24672 TEST=compiles Review URL: http://codereview.chromium.org/271066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
-rw-r--r--chrome/test/plugin/plugin_test.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 65eca9a..b9a1011 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -105,8 +105,10 @@ class PluginTest : public UITest {
// HTML for the tests is all located in test_directory\plugin\<testcase>
// Set |mock_http| to true to use mock HTTP server.
GURL GetTestUrl(const std::wstring &test_case, bool mock_http) {
- if (mock_http)
- return URLRequestMockHTTPJob::GetMockUrl(L"plugin/" + test_case);
+ if (mock_http) {
+ return URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(L"plugin/" + test_case));
+ }
FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);