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

Unified Diff: webkit/tools/test_shell/test_shell.cc

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.cc
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 763495ea41c2690ccefa820a47c11f872fccaa93..677dc426f9e173d5513da84f7fc0f8082174c970 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -88,7 +88,7 @@ class URLRequestTestShellFileJob : public net::URLRequestFileJob {
net::URLRequest* request,
net::NetworkDelegate* network_delegate,
const std::string& scheme) {
- FilePath path;
+ base::FilePath path;
PathService::Get(base::DIR_EXE, &path);
path = path.AppendASCII("resources");
path = path.AppendASCII("inspector");
@@ -99,7 +99,7 @@ class URLRequestTestShellFileJob : public net::URLRequestFileJob {
private:
URLRequestTestShellFileJob(net::URLRequest* request,
net::NetworkDelegate* network_delegate,
- const FilePath& path)
+ const base::FilePath& path)
: net::URLRequestFileJob(request, network_delegate, path) {
}
virtual ~URLRequestTestShellFileJob() { }
@@ -263,7 +263,7 @@ void TestShell::InitLogging(bool suppress_error_dialogs,
destination = logging::LOG_ONLY_TO_FILE;
// We might have multiple test_shell processes going at once
- FilePath log_filename;
+ base::FilePath log_filename;
PathService::Get(base::DIR_EXE, &log_filename);
log_filename = log_filename.AppendASCII("test_shell.log");
logging::InitLogging(
@@ -459,9 +459,9 @@ WebView* TestShell::CreateWebView() {
void TestShell::ShowDevTools() {
if (!devtools_shell_) {
- FilePath dir_exe;
+ base::FilePath dir_exe;
PathService::Get(base::DIR_EXE, &dir_exe);
- FilePath devtools_path =
+ base::FilePath devtools_path =
dir_exe.AppendASCII("resources/inspector/devtools.html");
TestShell* devtools_shell;
TestShell::CreateNewWindow(GURL(devtools_path.value()),
@@ -502,7 +502,7 @@ void TestShell::ResetTestController() {
geolocation_client_mock_->resetMock();
}
-void TestShell::LoadFile(const FilePath& file) {
+void TestShell::LoadFile(const base::FilePath& file) {
LoadURLForFrame(net::FilePathToFileURL(file), string16());
}
@@ -559,7 +559,7 @@ void TestShell::GoBackOrForward(int offset) {
}
void TestShell::DumpDocumentText() {
- FilePath file_path;
+ base::FilePath file_path;
if (!PromptForSaveFile(L"Dump document text", &file_path))
return;
@@ -569,7 +569,7 @@ void TestShell::DumpDocumentText() {
}
void TestShell::DumpRenderTree() {
- FilePath file_path;
+ base::FilePath file_path;
if (!PromptForSaveFile(L"Dump render tree", &file_path))
return;
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698