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

Unified Diff: content/shell/shell_browser_main.cc

Issue 12208057: Add explicit base to FilePath. (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 | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_browser_main.cc
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index 9256cb350fad36bc3b1f54f6ce47ee806bee3678..cffd46421c29c682973ddd7b9b584eaeb77a4fd7 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -25,7 +25,7 @@
namespace {
GURL GetURLForLayoutTest(const std::string& test_name,
- FilePath* current_working_directory,
+ base::FilePath* current_working_directory,
bool* enable_pixel_dumping,
std::string* expected_pixel_hash) {
// A test name is formated like file:///path/to/test'--pixel-test'pixelhash
@@ -55,14 +55,14 @@ GURL GetURLForLayoutTest(const std::string& test_name,
#if defined(OS_WIN)
std::wstring wide_path_or_url =
base::SysNativeMBToWide(path_or_url);
- FilePath local_file(wide_path_or_url);
+ base::FilePath local_file(wide_path_or_url);
#else
- FilePath local_file(path_or_url);
+ base::FilePath local_file(path_or_url);
#endif
file_util::AbsolutePath(&local_file);
test_url = net::FilePathToFileURL(local_file);
}
- FilePath local_path;
+ base::FilePath local_path;
if (current_working_directory) {
// We're outside of the message loop here, and this is a test.
base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ -142,7 +142,7 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
bool enable_pixel_dumps;
std::string pixel_hash;
- FilePath cwd;
+ base::FilePath cwd;
GURL test_url = GetURLForLayoutTest(
test_string, &cwd, &enable_pixel_dumps, &pixel_hash);
if (!content::WebKitTestController::Get()->PrepareForLayoutTest(
« no previous file with comments | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698