Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(611)

Side by Side Diff: chrome_frame/test/test_scrubber.cc

Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/test/simple_resource_loader_test.cc ('k') | chrome_frame/test/test_server.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // The test scrubber uses a Google Test event listener to trigger scrubs. 5 // The test scrubber uses a Google Test event listener to trigger scrubs.
6 // Scrubs are performed at the start of the test program and at the conclusion 6 // Scrubs are performed at the start of the test program and at the conclusion
7 // of each test. 7 // of each test.
8 8
9 #include "chrome_frame/test/test_scrubber.h" 9 #include "chrome_frame/test/test_scrubber.h"
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 // Kill all chrome_launcher processes trying to launch Chrome. 101 // Kill all chrome_launcher processes trying to launch Chrome.
102 base::KillProcesses(chrome_frame_test::kChromeLauncher, 0, NULL); 102 base::KillProcesses(chrome_frame_test::kChromeLauncher, 0, NULL);
103 103
104 // Kill all chrome.exe processes with --chrome-frame. 104 // Kill all chrome.exe processes with --chrome-frame.
105 KillAllNamedProcessesWithArgument( 105 KillAllNamedProcessesWithArgument(
106 chrome::kBrowserProcessExecutableName, 106 chrome::kBrowserProcessExecutableName,
107 ASCIIToWide(switches::kChromeFrame)); 107 ASCIIToWide(switches::kChromeFrame));
108 108
109 // Delete the user data directory. 109 // Delete the user data directory.
110 FilePath data_directory(data_directory_override_.empty() ? 110 base::FilePath data_directory(data_directory_override_.empty() ?
111 default_data_directory_ : 111 default_data_directory_ :
112 data_directory_override_); 112 data_directory_override_);
113 113
114 VLOG_IF(1, file_util::PathExists(data_directory)) 114 VLOG_IF(1, file_util::PathExists(data_directory))
115 << __FUNCTION__ << " deleting user data directory " 115 << __FUNCTION__ << " deleting user data directory "
116 << data_directory.value(); 116 << data_directory.value();
117 bool deleted = file_util::Delete(data_directory, true); 117 bool deleted = file_util::Delete(data_directory, true);
118 LOG_IF(ERROR, !deleted) 118 LOG_IF(ERROR, !deleted)
119 << "Failed to delete user data directory directory " 119 << "Failed to delete user data directory directory "
120 << data_directory.value(); 120 << data_directory.value();
(...skipping 16 matching lines...) Expand all
137 137
138 void OverrideDataDirectoryForThisTest( 138 void OverrideDataDirectoryForThisTest(
139 const base::StringPiece16& user_data_dir) { 139 const base::StringPiece16& user_data_dir) {
140 // Must be called within the context of a test. 140 // Must be called within the context of a test.
141 DCHECK(testing::UnitTest::GetInstance()->current_test_info()); 141 DCHECK(testing::UnitTest::GetInstance()->current_test_info());
142 142
143 g_scrubber.Get().set_data_directory_override(user_data_dir); 143 g_scrubber.Get().set_data_directory_override(user_data_dir);
144 } 144 }
145 145
146 } // namespace chrome_frame_test 146 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/test/simple_resource_loader_test.cc ('k') | chrome_frame/test/test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698