summaryrefslogtreecommitdiffstats
path: root/webkit/support/webkit_support.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/support/webkit_support.cc')
-rw-r--r--webkit/support/webkit_support.cc42
1 files changed, 21 insertions, 21 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 9e376272..66b9831 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -123,7 +123,7 @@ void InitLogging() {
// On Android we expect the log to appear in logcat.
base::InitAndroidTestLogging();
#else
- FilePath log_filename;
+ base::FilePath log_filename;
PathService::Get(base::DIR_EXE, &log_filename);
log_filename = log_filename.AppendASCII("DumpRenderTree.log");
logging::InitLogging(
@@ -215,11 +215,11 @@ class TestEnvironment {
// in SetCurrentDirectoryForFileURL() and GetAbsoluteWebStringFromUTF8Path(),
// as the directory might not exist on the device because we are using
// file-over-http bridge.
- void set_mock_current_directory(const FilePath& directory) {
+ void set_mock_current_directory(const base::FilePath& directory) {
mock_current_directory_ = directory;
}
- FilePath mock_current_directory() const {
+ base::FilePath mock_current_directory() const {
return mock_current_directory_;
}
@@ -240,7 +240,7 @@ class TestEnvironment {
scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
#if defined(OS_ANDROID)
- FilePath mock_current_directory_;
+ base::FilePath mock_current_directory_;
scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
#endif
@@ -253,7 +253,7 @@ class WebPluginImplWithPageDelegate
public:
WebPluginImplWithPageDelegate(WebFrame* frame,
const WebPluginParams& params,
- const FilePath& path)
+ const base::FilePath& path)
: webkit_support::TestWebPluginPageDelegate(),
webkit::npapi::WebPluginImpl(frame, params, path, AsWeakPtr()) {}
virtual ~WebPluginImplWithPageDelegate() {}
@@ -261,8 +261,8 @@ class WebPluginImplWithPageDelegate
DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate);
};
-FilePath GetWebKitRootDirFilePath() {
- FilePath basePath;
+base::FilePath GetWebKitRootDirFilePath() {
+ base::FilePath basePath;
PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
if (file_util::PathExists(
basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
@@ -353,8 +353,8 @@ void SetUpTestEnvironmentImpl(bool unit_test_mode,
namespace webkit_support {
-FilePath GetChromiumRootDirFilePath() {
- FilePath basePath;
+base::FilePath GetChromiumRootDirFilePath() {
+ base::FilePath basePath;
PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
if (file_util::PathExists(
basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
@@ -480,7 +480,7 @@ WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) {
}
WebKit::WebString GetWebKitRootDir() {
- FilePath path = GetWebKitRootDirFilePath();
+ base::FilePath path = GetWebKitRootDirFilePath();
std::string path_ascii = path.MaybeAsASCII();
CHECK(!path_ascii.empty());
return WebKit::WebString::fromUTF8(path_ascii.c_str());
@@ -619,11 +619,11 @@ void PostDelayedTask(TaskAdaptor* task, int64 delay_ms) {
WebString GetAbsoluteWebStringFromUTF8Path(const std::string& utf8_path) {
#if defined(OS_WIN)
- FilePath path(UTF8ToWide(utf8_path));
+ base::FilePath path(UTF8ToWide(utf8_path));
file_util::AbsolutePath(&path);
return WebString(path.value());
#else
- FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
+ base::FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
#if defined(OS_ANDROID)
if (WebKit::layoutTestMode()) {
// See comment of TestEnvironment::set_mock_current_directory().
@@ -655,9 +655,9 @@ WebURL CreateURLForPathOrURL(const std::string& path_or_url_in_nativemb) {
if (url.is_valid() && url.has_scheme())
return WebURL(url);
#if defined(OS_WIN)
- FilePath path(wide_path_or_url);
+ base::FilePath path(wide_path_or_url);
#else
- FilePath path(path_or_url_in_nativemb);
+ base::FilePath path(path_or_url_in_nativemb);
#endif
file_util::AbsolutePath(&path);
return net::FilePathToFileURL(path);
@@ -670,7 +670,7 @@ WebURL RewriteLayoutTestsURL(const std::string& utf8_url) {
if (utf8_url.compare(0, kPrefixLen, kPrefix, kPrefixLen))
return WebURL(GURL(utf8_url));
- FilePath replacePath =
+ base::FilePath replacePath =
GetWebKitRootDirFilePath().Append(FILE_PATH_LITERAL("LayoutTests/"));
// On Android, the file is actually accessed through file-over-http. Disable
@@ -692,14 +692,14 @@ WebURL RewriteLayoutTestsURL(const std::string& utf8_url) {
}
bool SetCurrentDirectoryForFileURL(const WebKit::WebURL& fileUrl) {
- FilePath local_path;
+ base::FilePath local_path;
if (!net::FileURLToFilePath(fileUrl, &local_path))
return false;
#if defined(OS_ANDROID)
if (WebKit::layoutTestMode()) {
// See comment of TestEnvironment::set_mock_current_directory().
DCHECK(test_environment);
- FilePath directory = local_path.DirName();
+ base::FilePath directory = local_path.DirName();
test_environment->set_mock_current_directory(directory);
// Still try to actually change the directory, but ignore any error.
// For a few tests that need to access resources directly as files
@@ -712,7 +712,7 @@ bool SetCurrentDirectoryForFileURL(const WebKit::WebURL& fileUrl) {
}
WebURL LocalFileToDataURL(const WebURL& fileUrl) {
- FilePath local_path;
+ base::FilePath local_path;
if (!net::FileURLToFilePath(fileUrl, &local_path))
return WebURL();
@@ -834,7 +834,7 @@ WebKit::WebThemeEngine* GetThemeEngine() {
// DevTools frontend path for inspector LayoutTests.
WebURL GetDevToolsPathAsURL() {
- FilePath dirExe;
+ base::FilePath dirExe;
if (!PathService::Get(base::DIR_EXE, &dirExe)) {
DCHECK(false);
return WebURL();
@@ -842,7 +842,7 @@ WebURL GetDevToolsPathAsURL() {
#if defined(OS_MACOSX)
dirExe = dirExe.AppendASCII("../../..");
#endif
- FilePath devToolsPath = dirExe.AppendASCII(
+ base::FilePath devToolsPath = dirExe.AppendASCII(
"resources/inspector/devtools.html");
return net::FilePathToFileURL(devToolsPath);
}
@@ -866,7 +866,7 @@ WebKit::WebString RegisterIsolatedFileSystem(
const WebKit::WebVector<WebKit::WebString>& filenames) {
fileapi::IsolatedContext::FileInfoSet files;
for (size_t i = 0; i < filenames.size(); ++i) {
- FilePath path = webkit_base::WebStringToFilePath(filenames[i]);
+ base::FilePath path = webkit_base::WebStringToFilePath(filenames[i]);
files.AddPath(path, NULL);
}
std::string filesystemId =
generated by cgit v1.1 at 2025-05-14 14:08:44 +0000