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

Unified Diff: chrome_frame/test_utils.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/util_unittests.cc ('k') | chrome_frame/utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test_utils.cc
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index ef8a288e3eb40f1b13c82e63e3c67f5574b7854b..fd1ec78fde78f22dcbc0f12ef1d1dde5e4ce3c09 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -32,11 +32,11 @@ const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe";
// the registrar.
const int64 kDllRegistrationTimeoutMs = 30 * 1000;
-FilePath GetChromeFrameBuildPath() {
- FilePath build_path;
+base::FilePath GetChromeFrameBuildPath() {
+ base::FilePath build_path;
PathService::Get(chrome::DIR_APP, &build_path);
- FilePath dll_path = build_path.Append(kChromeFrameDllName);
+ base::FilePath dll_path = build_path.Append(kChromeFrameDllName);
if (!file_util::PathExists(dll_path)) {
// Well, dang.. try looking in the current directory.
@@ -45,7 +45,7 @@ FilePath GetChromeFrameBuildPath() {
if (!file_util::PathExists(dll_path)) {
// No luck, return something empty.
- dll_path = FilePath();
+ dll_path = base::FilePath();
}
return dll_path;
@@ -149,8 +149,8 @@ void ScopedChromeFrameRegistrar::UnregisterAtPath(
DoRegistration(path, registration_type, UNREGISTER);
}
-FilePath ScopedChromeFrameRegistrar::GetReferenceChromeFrameDllPath() {
- FilePath reference_build_dir;
+base::FilePath ScopedChromeFrameRegistrar::GetReferenceChromeFrameDllPath() {
+ base::FilePath reference_build_dir;
PathService::Get(chrome::DIR_APP, &reference_build_dir);
reference_build_dir = reference_build_dir.DirName();
@@ -240,7 +240,8 @@ ScopedChromeFrameRegistrar::ScopedChromeFrameRegistrar(
}
ScopedChromeFrameRegistrar::~ScopedChromeFrameRegistrar() {
- if (FilePath(original_dll_path_) != FilePath(new_chrome_frame_dll_path_)) {
+ if (base::FilePath(original_dll_path_) !=
+ base::FilePath(new_chrome_frame_dll_path_)) {
RegisterChromeFrameAtPath(original_dll_path_);
} else if (registration_type_ == PER_USER) {
UnregisterAtPath(new_chrome_frame_dll_path_, registration_type_);
« no previous file with comments | « chrome_frame/test/util_unittests.cc ('k') | chrome_frame/utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698