summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 21:36:55 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 21:36:55 +0000
commitba2d09a6bda6e061cf9b826399be1c7b63c60034 (patch)
treea4a40c68bc4414c26bbc491839cc16db06081aed /chrome_frame
parent3fcf01103c8fbf44382862bc827f294dc140f901 (diff)
downloadchromium_src-ba2d09a6bda6e061cf9b826399be1c7b63c60034.zip
chromium_src-ba2d09a6bda6e061cf9b826399be1c7b63c60034.tar.gz
chromium_src-ba2d09a6bda6e061cf9b826399be1c7b63c60034.tar.bz2
Cleanup: Remove some deprecated file_util methods.
BUG=24672 TEST=none Review URL: http://codereview.chromium.org/9442038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 3ce5824..7175eb8 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -192,10 +192,9 @@ base::ProcessHandle LaunchChrome(const std::wstring& url) {
}
base::ProcessHandle LaunchIEOnVista(const std::wstring& url) {
- typedef HRESULT (WINAPI* IELaunchURLPtr)(
- const wchar_t* url,
- PROCESS_INFORMATION *pi,
- VOID *info);
+ typedef HRESULT (WINAPI* IELaunchURLPtr)(const wchar_t* url,
+ PROCESS_INFORMATION* pi,
+ VOID* info);
IELaunchURLPtr launch;
PROCESS_INFORMATION pi = {0};
@@ -661,12 +660,13 @@ ScopedChromeFrameRegistrar::RegistrationType GetTestBedType() {
}
void ClearIESessionHistory() {
- wchar_t local_app_data_path[MAX_PATH + 1] = {0};
- SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT,
- local_app_data_path);
+ FilePath session_history_path;
+ if (!PathService::Get(base::DIR_LOCAL_APP_DATA, &session_history_path))
+ return;
- std::wstring session_history_path = local_app_data_path;
- session_history_path += L"\\Microsoft\\Internet Explorer\\Recovery";
+ session_history_path = session_history_path.AppendASCII("Microsoft");
+ session_history_path = session_history_path.AppendASCII("Internet Explorer");
+ session_history_path = session_history_path.AppendASCII("Recovery");
file_util::Delete(session_history_path, true);
}