summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_with_web_server.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 21:54:53 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 21:54:53 +0000
commitd8369b60d7dafe4398a90e953aead9e4d93a8f57 (patch)
tree91f94aa39115c08d249b3870698cc0efa66d01f6 /chrome_frame/test/test_with_web_server.h
parent3ae48992d444dde7397bf84033f4276fa6b3131e (diff)
downloadchromium_src-d8369b60d7dafe4398a90e953aead9e4d93a8f57.zip
chromium_src-d8369b60d7dafe4398a90e953aead9e4d93a8f57.tar.gz
chromium_src-d8369b60d7dafe4398a90e953aead9e4d93a8f57.tar.bz2
chrome_frame: Get rid of all occurrences of file_util::AppendToPath.
BUG=24874 TEST=trybots Review URL: http://codereview.chromium.org/2637001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.h')
-rw-r--r--chrome_frame/test/test_with_web_server.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h
index 2f3c05d7..16b03bc 100644
--- a/chrome_frame/test/test_with_web_server.h
+++ b/chrome_frame/test/test_with_web_server.h
@@ -1,6 +1,7 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+
#ifndef CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
#define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
@@ -90,7 +91,7 @@ class ChromeFrameTestWithWebServer: public testing::Test {
}
BrowserKind browser_;
- std::wstring results_dir_;
+ FilePath results_dir_;
ScopedHandle browser_handle_;
ChromeFrameHTTPServer server_;
// The on-disk path to our html test files.
@@ -176,4 +177,3 @@ class SimpleWebServerTest {
};
#endif // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
-