diff options
58 files changed, 211 insertions, 201 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index eb0eba3..047a8bb 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -364,7 +364,7 @@ int RunZygote(const MainFunctionParams& main_function_params, // Each Renderer we spawn will re-attempt initialization of the media // libraries, at which point failure will be detected and handled, so // we do not need to cope with initialization failures here. - FilePath media_path; + base::FilePath media_path; if (PathService::Get(DIR_MEDIA_LIBS, &media_path)) media::InitializeMediaLibrary(media_path); } diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc index 06d2ae4..76fb6c9 100644 --- a/content/gpu/gpu_info_collector_linux.cc +++ b/content/gpu/gpu_info_collector_linux.cc @@ -31,8 +31,8 @@ namespace { // This checks if a system supports PCI bus. // We check the existence of /sys/bus/pci or /sys/bug/pci_express. bool IsPciSupported() { - const FilePath pci_path("/sys/bus/pci/"); - const FilePath pcie_path("/sys/bus/pci_express/"); + const base::FilePath pci_path("/sys/bus/pci/"); + const base::FilePath pcie_path("/sys/bus/pci_express/"); return (file_util::PathExists(pci_path) || file_util::PathExists(pcie_path)); } @@ -40,9 +40,9 @@ bool IsPciSupported() { // Scan /etc/ati/amdpcsdb.default for "ReleaseVersion". // Return empty string on failing. std::string CollectDriverVersionATI() { - const FilePath::CharType kATIFileName[] = + const base::FilePath::CharType kATIFileName[] = FILE_PATH_LITERAL("/etc/ati/amdpcsdb.default"); - FilePath ati_file_path(kATIFileName); + base::FilePath ati_file_path(kATIFileName); if (!file_util::PathExists(ati_file_path)) return std::string(); std::string contents; diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index f171374..50806f6 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -67,18 +67,18 @@ content::GpuPerformanceStats RetrieveGpuPerformanceStats() { // Find most recent formal assessment results. file_util::FileEnumerator file_enumerator( - FilePath(winsat_results_path), + base::FilePath(winsat_results_path), false, // not recursive file_util::FileEnumerator::FILES, FILE_PATH_LITERAL("* * Formal.Assessment (*).WinSAT.xml")); - FilePath current_results; - for (FilePath results = file_enumerator.Next(); !results.empty(); + base::FilePath current_results; + for (base::FilePath results = file_enumerator.Next(); !results.empty(); results = file_enumerator.Next()) { // The filenames start with the date and time as yyyy-mm-dd hh.mm.ss.xxx, // so the greatest file lexicographically is also the most recent file. - if (FilePath::CompareLessIgnoreCase(current_results.value(), - results.value())) + if (base::FilePath::CompareLessIgnoreCase(current_results.value(), + results.value())) current_results = results; } diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index c579ea9..aef0ec4 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -297,7 +297,7 @@ void PluginChannel::OnClearSiteData(const std::string& site, uint64 max_age) { bool success = false; CommandLine* command_line = CommandLine::ForCurrentProcess(); - FilePath path = command_line->GetSwitchValuePath(switches::kPluginPath); + base::FilePath path = command_line->GetSwitchValuePath(switches::kPluginPath); scoped_refptr<webkit::npapi::PluginLib> plugin_lib( webkit::npapi::PluginLib::CreatePluginLib(path)); if (plugin_lib.get()) { diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 0629d5a..3182158 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -77,8 +77,9 @@ static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls = PluginThread::PluginThread() : preloaded_plugin_module_(NULL) { - FilePath plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath( - switches::kPluginPath); + base::FilePath plugin_path = + CommandLine::ForCurrentProcess()->GetSwitchValuePath( + switches::kPluginPath); lazy_tls.Pointer()->Set(this); #if defined(USE_AURA) diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc index 0b7f0f0..b5098fc 100644 --- a/content/plugin/webplugin_delegate_stub.cc +++ b/content/plugin/webplugin_delegate_stub.cc @@ -160,7 +160,7 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params, } const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - FilePath path = + base::FilePath path = command_line.GetSwitchValuePath(switches::kPluginPath); webplugin_ = new WebPluginProxy( diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc index 8a4f24a..d9dd974 100644 --- a/content/ppapi_plugin/broker_process_dispatcher.cc +++ b/content/ppapi_plugin/broker_process_dispatcher.cc @@ -19,7 +19,7 @@ namespace { // How long we wait before releasing the broker process. const int kBrokerReleaseTimeSeconds = 30; -std::string ConvertPluginDataPath(const FilePath& plugin_data_path) { +std::string ConvertPluginDataPath(const base::FilePath& plugin_data_path) { // The string is always 8-bit, convert on Windows. #if defined(OS_WIN) return WideToUTF8(plugin_data_path.value()); @@ -137,7 +137,7 @@ void BrokerProcessDispatcher::OnGetPermissionSettingsCompleted( void BrokerProcessDispatcher::OnGetSitesWithData( uint32 request_id, - const FilePath& plugin_data_path) { + const base::FilePath& plugin_data_path) { std::vector<std::string> sites; GetSitesWithData(plugin_data_path, &sites); Send(new PpapiHostMsg_GetSitesWithDataResult(request_id, sites)); @@ -145,7 +145,7 @@ void BrokerProcessDispatcher::OnGetSitesWithData( void BrokerProcessDispatcher::OnClearSiteData( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, const std::string& site, uint64 flags, uint64 max_age) { @@ -155,14 +155,14 @@ void BrokerProcessDispatcher::OnClearSiteData( void BrokerProcessDispatcher::OnDeauthorizeContentLicenses( uint32 request_id, - const FilePath& plugin_data_path) { + const base::FilePath& plugin_data_path) { Send(new PpapiHostMsg_DeauthorizeContentLicensesResult( request_id, DeauthorizeContentLicenses(plugin_data_path))); } void BrokerProcessDispatcher::OnGetPermissionSettings( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type) { if (flash_browser_operations_1_3_) { std::string data_str = ConvertPluginDataPath(plugin_data_path); @@ -192,7 +192,7 @@ void BrokerProcessDispatcher::OnGetPermissionSettings( void BrokerProcessDispatcher::OnSetDefaultPermission( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific) { @@ -204,7 +204,7 @@ void BrokerProcessDispatcher::OnSetDefaultPermission( void BrokerProcessDispatcher::OnSetSitePermission( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites) { Send(new PpapiHostMsg_SetSitePermissionResult( @@ -212,7 +212,7 @@ void BrokerProcessDispatcher::OnSetSitePermission( } void BrokerProcessDispatcher::GetSitesWithData( - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, std::vector<std::string>* site_vector) { std::string data_str = ConvertPluginDataPath(plugin_data_path); if (flash_browser_operations_1_3_) { @@ -228,10 +228,11 @@ void BrokerProcessDispatcher::GetSitesWithData( } } -bool BrokerProcessDispatcher::ClearSiteData(const FilePath& plugin_data_path, - const std::string& site, - uint64 flags, - uint64 max_age) { +bool BrokerProcessDispatcher::ClearSiteData( + const base::FilePath& plugin_data_path, + const std::string& site, + uint64 flags, + uint64 max_age) { std::string data_str = ConvertPluginDataPath(plugin_data_path); if (flash_browser_operations_1_3_) { flash_browser_operations_1_3_->ClearSiteData( @@ -257,7 +258,7 @@ bool BrokerProcessDispatcher::ClearSiteData(const FilePath& plugin_data_path, } bool BrokerProcessDispatcher::DeauthorizeContentLicenses( - const FilePath& plugin_data_path) { + const base::FilePath& plugin_data_path) { if (flash_browser_operations_1_3_) { std::string data_str = ConvertPluginDataPath(plugin_data_path); return PP_ToBool(flash_browser_operations_1_3_->DeauthorizeContentLicenses( @@ -274,7 +275,7 @@ bool BrokerProcessDispatcher::DeauthorizeContentLicenses( } bool BrokerProcessDispatcher::SetDefaultPermission( - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific) { @@ -296,7 +297,7 @@ bool BrokerProcessDispatcher::SetDefaultPermission( } bool BrokerProcessDispatcher::SetSitePermission( - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites) { if (sites.empty()) diff --git a/content/ppapi_plugin/broker_process_dispatcher.h b/content/ppapi_plugin/broker_process_dispatcher.h index 8200a7f..dd8c6a6 100644 --- a/content/ppapi_plugin/broker_process_dispatcher.h +++ b/content/ppapi_plugin/broker_process_dispatcher.h @@ -35,46 +35,46 @@ class BrokerProcessDispatcher private: void OnGetSitesWithData(uint32 request_id, - const FilePath& plugin_data_path); + const base::FilePath& plugin_data_path); void OnClearSiteData(uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, const std::string& site, uint64 flags, uint64 max_age); void OnDeauthorizeContentLicenses(uint32 request_id, - const FilePath& plugin_data_path); + const base::FilePath& plugin_data_path); void OnGetPermissionSettings( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type); void OnSetDefaultPermission( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific); void OnSetSitePermission( uint32 request_id, - const FilePath& plugin_data_path, + const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites); // Returns a list of sites that have data stored. - void GetSitesWithData(const FilePath& plugin_data_path, + void GetSitesWithData(const base::FilePath& plugin_data_path, std::vector<std::string>* sites); // Requests that the plugin clear data, returning true on success. - bool ClearSiteData(const FilePath& plugin_data_path, + bool ClearSiteData(const base::FilePath& plugin_data_path, const std::string& site, uint64 flags, uint64 max_age); - bool DeauthorizeContentLicenses(const FilePath& plugin_data_path); - bool SetDefaultPermission(const FilePath& plugin_data_path, + bool DeauthorizeContentLicenses(const base::FilePath& plugin_data_path); + bool SetDefaultPermission(const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, PP_Flash_BrowserOperations_Permission permission, bool clear_site_specific); - bool SetSitePermission(const FilePath& plugin_data_path, + bool SetSitePermission(const base::FilePath& plugin_data_path, PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites); diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 3bd4edd..6aa7b80 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -225,7 +225,7 @@ void PpapiThread::Unregister(uint32 plugin_dispatcher_id) { plugin_dispatchers_.erase(plugin_dispatcher_id); } -void PpapiThread::OnLoadPlugin(const FilePath& path, +void PpapiThread::OnLoadPlugin(const base::FilePath& path, const ppapi::PpapiPermissions& permissions) { SavePluginName(path); @@ -450,7 +450,7 @@ bool PpapiThread::SetupRendererChannel(base::ProcessId renderer_pid, return true; } -void PpapiThread::SavePluginName(const FilePath& path) { +void PpapiThread::SavePluginName(const base::FilePath& path) { ppapi::proxy::PluginGlobals::Get()->set_plugin_name( path.BaseName().AsUTF8Unsafe()); diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc index 83f24f6..e2313ba 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc @@ -44,7 +44,7 @@ void ParseArgsFromCommandLineFile(std::vector<std::string>* args) { // "/data/local/tmp". static const char kCommandLineFilePath[] = "/data/local/tmp/content-browser-tests-command-line"; - FilePath command_line(kCommandLineFilePath); + base::FilePath command_line(kCommandLineFilePath); std::string command_line_string; if (file_util::ReadFileToString(command_line, &command_line_string)) { ParseArgsFromString(command_line_string, args); diff --git a/content/shell/paths_mac.h b/content/shell/paths_mac.h index 35e7432..ac1f4f9 100644 --- a/content/shell/paths_mac.h +++ b/content/shell/paths_mac.h @@ -14,6 +14,6 @@ void OverrideFrameworkBundlePath(); void OverrideChildProcessPath(); // Gets the path to the content shell's pak file. -FilePath GetResourcesPakFilePath(); +base::FilePath GetResourcesPakFilePath(); #endif // CONTENT_SHELL_PATHS_MAC_H_ diff --git a/content/shell/paths_mac.mm b/content/shell/paths_mac.mm index 27162b1..120ca34 100644 --- a/content/shell/paths_mac.mm +++ b/content/shell/paths_mac.mm @@ -11,9 +11,9 @@ namespace { -FilePath GetFrameworksPath() { +base::FilePath GetFrameworksPath() { // Start out with the path to the running executable. - FilePath path; + base::FilePath path; PathService::Get(base::FILE_EXE, &path); // Up to Contents. @@ -35,14 +35,15 @@ FilePath GetFrameworksPath() { } // namespace void OverrideFrameworkBundlePath() { - FilePath helper_path = + base::FilePath helper_path = GetFrameworksPath().Append("Content Shell Framework.framework"); base::mac::SetOverrideFrameworkBundlePath(helper_path); } void OverrideChildProcessPath() { - FilePath helper_path = GetFrameworksPath().Append("Content Shell Helper.app") + base::FilePath helper_path = + GetFrameworksPath().Append("Content Shell Helper.app") .Append("Contents") .Append("MacOS") .Append("Content Shell Helper"); @@ -50,7 +51,7 @@ void OverrideChildProcessPath() { PathService::Override(content::CHILD_PROCESS_EXE, helper_path); } -FilePath GetResourcesPakFilePath() { +base::FilePath GetResourcesPakFilePath() { NSString* pak_path = [base::mac::FrameworkBundle() pathForResource:@"content_shell" ofType:@"pak"]; diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc index 86ae1a44..b464477 100644 --- a/content/shell/shell_browser_context.cc +++ b/content/shell/shell_browser_context.cc @@ -56,7 +56,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { path_ = path_.Append(std::wstring(L"content_shell")); #elif defined(OS_LINUX) scoped_ptr<base::Environment> env(base::Environment::Create()); - FilePath config_dir( + base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); @@ -75,7 +75,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { file_util::CreateDirectory(path_); } -FilePath ShellBrowserContext::GetPath() { +base::FilePath ShellBrowserContext::GetPath() { return path_; } @@ -129,14 +129,14 @@ net::URLRequestContextGetter* net::URLRequestContextGetter* ShellBrowserContext::GetMediaRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory) { return GetRequestContext(); } net::URLRequestContextGetter* ShellBrowserContext::GetRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory) { return NULL; } diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h index f58132e..8b82b8a 100644 --- a/content/shell/shell_browser_context.h +++ b/content/shell/shell_browser_context.h @@ -23,7 +23,7 @@ class ShellBrowserContext : public BrowserContext { virtual ~ShellBrowserContext(); // BrowserContext implementation. - virtual FilePath GetPath() OVERRIDE; + virtual base::FilePath GetPath() OVERRIDE; virtual bool IsOffTheRecord() const OVERRIDE; virtual DownloadManagerDelegate* GetDownloadManagerDelegate() OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; @@ -34,10 +34,10 @@ class ShellBrowserContext : public BrowserContext { int renderer_child_id) OVERRIDE; virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory) OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory) OVERRIDE; virtual ResourceContext* GetResourceContext() OVERRIDE; virtual GeolocationPermissionContext* @@ -53,7 +53,7 @@ class ShellBrowserContext : public BrowserContext { bool off_the_record_; bool ignore_certificate_errors_; - FilePath path_; + base::FilePath path_; scoped_ptr<ResourceContext> resource_context_; scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_; scoped_refptr<net::URLRequestContextGetter> url_request_getter_; diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 9256cb3..cffd464 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( diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index bc4bfe3..dd81bce 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -55,7 +55,7 @@ static GURL GetStartupURL() { if (url.is_valid() && url.has_scheme()) return url; - return net::FilePathToFileURL(FilePath(args[0])); + return net::FilePathToFileURL(base::FilePath(args[0])); } base::StringPiece PlatformResourceProvider(int key) { diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc index ebed751..abc24d1 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/shell_content_browser_client.cc @@ -34,8 +34,8 @@ namespace content { namespace { -FilePath GetWebKitRootDirFilePath() { - FilePath base_path; +base::FilePath GetWebKitRootDirFilePath() { + base::FilePath base_path; PathService::Get(base::DIR_SOURCE_ROOT, &base_path); if (file_util::PathExists( base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")))) { @@ -135,7 +135,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( int child_process_id, std::vector<content::FileDescriptorInfo>* mappings) { int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ; - FilePath pak_file; + base::FilePath pak_file; bool r = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file); CHECK(r); pak_file = pak_file.Append(FILE_PATH_LITERAL("paks")); diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index a130d89..91d821e 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.h @@ -65,7 +65,7 @@ class ShellContentBrowserClient : public ContentBrowserClient { scoped_ptr<ShellResourceDispatcherHostDelegate> resource_dispatcher_host_delegate_; - FilePath webkit_source_dir_; + base::FilePath webkit_source_dir_; ShellBrowserMainParts* shell_browser_main_parts_; }; diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/shell_devtools_delegate.cc index fbf6e5c..c428535 100644 --- a/content/shell/shell_devtools_delegate.cc +++ b/content/shell/shell_devtools_delegate.cc @@ -56,8 +56,8 @@ bool ShellDevToolsDelegate::BundlesFrontendResources() { return true; } -FilePath ShellDevToolsDelegate::GetDebugFrontendDir() { - return FilePath(); +base::FilePath ShellDevToolsDelegate::GetDebugFrontendDir() { + return base::FilePath(); } std::string ShellDevToolsDelegate::GetPageThumbnailData(const GURL& url) { diff --git a/content/shell/shell_devtools_delegate.h b/content/shell/shell_devtools_delegate.h index 38598fb..03342dd 100644 --- a/content/shell/shell_devtools_delegate.h +++ b/content/shell/shell_devtools_delegate.h @@ -27,7 +27,7 @@ class ShellDevToolsDelegate : public DevToolsHttpHandlerDelegate { // DevToolsHttpProtocolHandler::Delegate overrides. virtual std::string GetDiscoveryPageHTML() OVERRIDE; virtual bool BundlesFrontendResources() OVERRIDE; - virtual FilePath GetDebugFrontendDir() OVERRIDE; + virtual base::FilePath GetDebugFrontendDir() OVERRIDE; virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE; virtual RenderViewHost* CreateNewTarget() OVERRIDE; virtual TargetType GetTargetType(RenderViewHost*) OVERRIDE; diff --git a/content/shell/shell_download_manager_delegate.cc b/content/shell/shell_download_manager_delegate.cc index 3c41bcb..0771754 100644 --- a/content/shell/shell_download_manager_delegate.cc +++ b/content/shell/shell_download_manager_delegate.cc @@ -66,7 +66,7 @@ bool ShellDownloadManagerDelegate::DetermineDownloadTarget( return true; } - FilePath generated_name = net::GenerateFileName( + base::FilePath generated_name = net::GenerateFileName( download->GetURL(), download->GetContentDisposition(), EmptyString(), @@ -87,13 +87,13 @@ bool ShellDownloadManagerDelegate::DetermineDownloadTarget( void ShellDownloadManagerDelegate::GenerateFilename( int32 download_id, const DownloadTargetCallback& callback, - const FilePath& generated_name, - const FilePath& suggested_directory) { + const base::FilePath& generated_name, + const base::FilePath& suggested_directory) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); if (!file_util::PathExists(suggested_directory)) file_util::CreateDirectory(suggested_directory); - FilePath suggested_path(suggested_directory.Append(generated_name)); + base::FilePath suggested_path(suggested_directory.Append(generated_name)); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -105,7 +105,7 @@ void ShellDownloadManagerDelegate::GenerateFilename( void ShellDownloadManagerDelegate::OnDownloadPathGenerated( int32 download_id, const DownloadTargetCallback& callback, - const FilePath& suggested_path) { + const base::FilePath& suggested_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (suppress_prompting_) { // Testing exit. @@ -121,15 +121,15 @@ void ShellDownloadManagerDelegate::OnDownloadPathGenerated( void ShellDownloadManagerDelegate::ChooseDownloadPath( int32 download_id, const DownloadTargetCallback& callback, - const FilePath& suggested_path) { + const base::FilePath& suggested_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DownloadItem* item = download_manager_->GetDownload(download_id); if (!item || (item->GetState() != DownloadItem::IN_PROGRESS)) return; - FilePath result; + base::FilePath result; #if defined(OS_WIN) && !defined(USE_AURA) - std::wstring file_part = FilePath(suggested_path).BaseName().value(); + std::wstring file_part = base::FilePath(suggested_path).BaseName().value(); wchar_t file_name[MAX_PATH]; base::wcslcpy(file_name, file_part.c_str(), arraysize(file_name)); OPENFILENAME save_as; @@ -148,11 +148,11 @@ void ShellDownloadManagerDelegate::ChooseDownloadPath( OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST; if (GetSaveFileName(&save_as)) - result = FilePath(std::wstring(save_as.lpstrFile)); + result = base::FilePath(std::wstring(save_as.lpstrFile)); #elif defined(TOOLKIT_GTK) GtkWidget *dialog; gfx::NativeWindow parent_window; - std::string base_name = FilePath(suggested_path).BaseName().value(); + std::string base_name = base::FilePath(suggested_path).BaseName().value(); parent_window = item->GetWebContents()->GetView()->GetTopLevelNativeWindow(); dialog = gtk_file_chooser_dialog_new("Save File", @@ -169,7 +169,7 @@ void ShellDownloadManagerDelegate::ChooseDownloadPath( if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { char *filename; filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - result = FilePath(filename); + result = base::FilePath(filename); } gtk_widget_destroy(dialog); #else @@ -181,7 +181,7 @@ void ShellDownloadManagerDelegate::ChooseDownloadPath( } void ShellDownloadManagerDelegate::SetDownloadBehaviorForTesting( - const FilePath& default_download_path) { + const base::FilePath& default_download_path) { default_download_path_ = default_download_path; suppress_prompting_ = true; } diff --git a/content/shell/shell_download_manager_delegate.h b/content/shell/shell_download_manager_delegate.h index 4dd08d7..87cf290 100644 --- a/content/shell/shell_download_manager_delegate.h +++ b/content/shell/shell_download_manager_delegate.h @@ -28,7 +28,7 @@ class ShellDownloadManagerDelegate // Inhibits prompting and sets the default download path. void SetDownloadBehaviorForTesting( - const FilePath& default_download_path); + const base::FilePath& default_download_path); protected: // To allow subclasses for testing. @@ -40,17 +40,17 @@ class ShellDownloadManagerDelegate void GenerateFilename(int32 download_id, const DownloadTargetCallback& callback, - const FilePath& generated_name, - const FilePath& suggested_directory); + const base::FilePath& generated_name, + const base::FilePath& suggested_directory); void OnDownloadPathGenerated(int32 download_id, const DownloadTargetCallback& callback, - const FilePath& suggested_path); + const base::FilePath& suggested_path); void ChooseDownloadPath(int32 download_id, const DownloadTargetCallback& callback, - const FilePath& suggested_path); + const base::FilePath& suggested_path); DownloadManager* download_manager_; - FilePath default_download_path_; + base::FilePath default_download_path_; bool suppress_prompting_; DISALLOW_COPY_AND_ASSIGN(ShellDownloadManagerDelegate); diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index 5e81a42..3e87033 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -65,7 +65,7 @@ const GUID kContentShellProviderName = { #endif void InitLogging() { - FilePath log_filename; + base::FilePath log_filename; PathService::Get(base::DIR_EXE, &log_filename); log_filename = log_filename.AppendASCII("content_shell.log"); logging::InitLogging( @@ -158,11 +158,11 @@ void ShellMainDelegate::InitializeResourceBundle() { } #endif - FilePath pak_file; + base::FilePath pak_file; #if defined(OS_MACOSX) pak_file = GetResourcesPakFilePath(); #else - FilePath pak_dir; + base::FilePath pak_dir; #if defined(OS_ANDROID) bool got_path = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir); diff --git a/content/shell/shell_message_filter.cc b/content/shell/shell_message_filter.cc index 4450a7d..e9d3445 100644 --- a/content/shell/shell_message_filter.cc +++ b/content/shell/shell_message_filter.cc @@ -31,13 +31,13 @@ bool ShellMessageFilter::OnMessageReceived(const IPC::Message& message, return handled; } -void ShellMessageFilter::OnReadFileToString(const FilePath& local_file, +void ShellMessageFilter::OnReadFileToString(const base::FilePath& local_file, std::string* contents) { file_util::ReadFileToString(local_file, contents); } void ShellMessageFilter::OnRegisterIsolatedFileSystem( - const std::vector<FilePath>& absolute_filenames, + const std::vector<base::FilePath>& absolute_filenames, std::string* filesystem_id) { fileapi::IsolatedContext::FileInfoSet files; ChildProcessSecurityPolicy* policy = diff --git a/content/shell/shell_message_filter.h b/content/shell/shell_message_filter.h index 50eb29e..52eaf20 100644 --- a/content/shell/shell_message_filter.h +++ b/content/shell/shell_message_filter.h @@ -25,9 +25,10 @@ class ShellMessageFilter : public BrowserMessageFilter { virtual bool OnMessageReceived(const IPC::Message& message, bool* message_was_ok) OVERRIDE; - void OnReadFileToString(const FilePath& local_file, std::string* contents); + void OnReadFileToString(const base::FilePath& local_file, + std::string* contents); void OnRegisterIsolatedFileSystem( - const std::vector<FilePath>& absolute_filenames, + const std::vector<base::FilePath>& absolute_filenames, std::string* filesystem_id); int render_process_id_; diff --git a/content/shell/shell_messages.h b/content/shell/shell_messages.h index e125b27..ac2b98e 100644 --- a/content/shell/shell_messages.h +++ b/content/shell/shell_messages.h @@ -14,7 +14,7 @@ // Sets the current working directory to use for layout tests. IPC_MESSAGE_ROUTED1(ShellViewMsg_SetCurrentWorkingDirectory, - FilePath /* current_working_directory */) + base::FilePath /* current_working_directory */) // Tells the render view to capture a text dump of the page. The render view // responds with a ShellViewHostMsg_TextDump. @@ -33,7 +33,7 @@ IPC_MESSAGE_CONTROL0(ShellViewMsg_ResetAll) // Sets the path to the WebKit checkout. IPC_MESSAGE_CONTROL1(ShellViewMsg_SetWebKitSourceDir, - FilePath /* webkit source dir */) + base::FilePath /* webkit source dir */) // Send a text dump of the WebContents to the render host. IPC_MESSAGE_ROUTED1(ShellViewHostMsg_TextDump, @@ -53,7 +53,7 @@ IPC_MESSAGE_ROUTED1(ShellViewHostMsg_PrintMessage, // Read a file and returns its contents. IPC_SYNC_MESSAGE_ROUTED1_1(ShellViewHostMsg_ReadFileToString, - FilePath /* local path */, + base::FilePath /* local path */, std::string /* contents */) // The following messages correspond to methods of the testRunner. @@ -71,7 +71,7 @@ IPC_MESSAGE_ROUTED0(ShellViewHostMsg_CanOpenWindows) IPC_MESSAGE_ROUTED0(ShellViewHostMsg_ShowWebInspector) IPC_MESSAGE_ROUTED0(ShellViewHostMsg_CloseWebInspector) IPC_SYNC_MESSAGE_ROUTED1_1(ShellViewHostMsg_RegisterIsolatedFileSystem, - std::vector<FilePath> /* absolute_filenames */, + std::vector<base::FilePath> /* absolute_filenames */, std::string /* filesystem_id */) IPC_MESSAGE_ROUTED2(ShellViewHostMsg_NotImplemented, diff --git a/content/shell/shell_network_delegate.cc b/content/shell/shell_network_delegate.cc index bf23a20..e19c5c8 100644 --- a/content/shell/shell_network_delegate.cc +++ b/content/shell/shell_network_delegate.cc @@ -82,7 +82,7 @@ bool ShellNetworkDelegate::OnCanSetCookie(const net::URLRequest& request, } bool ShellNetworkDelegate::OnCanAccessFile(const net::URLRequest& request, - const FilePath& path) const { + const base::FilePath& path) const { return true; } diff --git a/content/shell/shell_render_process_observer.cc b/content/shell/shell_render_process_observer.cc index fff9bfc..bbabb82 100644 --- a/content/shell/shell_render_process_observer.cc +++ b/content/shell/shell_render_process_observer.cc @@ -105,7 +105,7 @@ void ShellRenderProcessObserver::OnResetAll() { } void ShellRenderProcessObserver::OnSetWebKitSourceDir( - const FilePath& webkit_source_dir) { + const base::FilePath& webkit_source_dir) { webkit_source_dir_ = webkit_source_dir; } diff --git a/content/shell/shell_render_process_observer.h b/content/shell/shell_render_process_observer.h index 1f8932d..4a487e0 100644 --- a/content/shell/shell_render_process_observer.h +++ b/content/shell/shell_render_process_observer.h @@ -44,18 +44,18 @@ class ShellRenderProcessObserver : public RenderProcessObserver { return test_delegate_; } WebKitTestRunner* main_test_runner() const { return main_test_runner_; } - const FilePath& webkit_source_dir() const { return webkit_source_dir_; } + const base::FilePath& webkit_source_dir() const { return webkit_source_dir_; } private: // Message handlers. void OnResetAll(); - void OnSetWebKitSourceDir(const FilePath& webkit_source_dir); + void OnSetWebKitSourceDir(const base::FilePath& webkit_source_dir); RenderView* main_render_view_; WebKitTestRunner* main_test_runner_; WebTestRunner::WebTestDelegate* test_delegate_; - FilePath webkit_source_dir_; + base::FilePath webkit_source_dir_; DISALLOW_COPY_AND_ASSIGN(ShellRenderProcessObserver); }; diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index 7bda6f9..b085b9e 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -35,7 +35,7 @@ namespace content { ShellURLRequestContextGetter::ShellURLRequestContextGetter( bool ignore_certificate_errors, - const FilePath& base_path, + const base::FilePath& base_path, MessageLoop* io_loop, MessageLoop* file_loop) : ignore_certificate_errors_(ignore_certificate_errors), @@ -96,7 +96,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() { net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); storage_->set_http_server_properties(new net::HttpServerPropertiesImpl); - FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); + base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); net::HttpCache::DefaultBackend* main_backend = new net::HttpCache::DefaultBackend( net::DISK_CACHE, diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/shell_url_request_context_getter.h index 957f046..764a9e6 100644 --- a/content/shell/shell_url_request_context_getter.h +++ b/content/shell/shell_url_request_context_getter.h @@ -27,7 +27,7 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter { public: ShellURLRequestContextGetter( bool ignore_certificate_errors, - const FilePath& base_path, + const base::FilePath& base_path, MessageLoop* io_loop, MessageLoop* file_loop); @@ -43,7 +43,7 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter { private: bool ignore_certificate_errors_; - FilePath base_path_; + base::FilePath base_path_; MessageLoop* io_loop_; MessageLoop* file_loop_; diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index d812a9dc..257859b 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -150,7 +150,7 @@ WebKitTestController::~WebKitTestController() { bool WebKitTestController::PrepareForLayoutTest( const GURL& test_url, - const FilePath& current_working_directory, + const base::FilePath& current_working_directory, bool enable_pixel_dumping, const std::string& expected_pixel_hash) { DCHECK(CalledOnValidThread()); @@ -275,7 +275,7 @@ bool WebKitTestController::OnMessageReceived(const IPC::Message& message) { return handled; } -void WebKitTestController::PluginCrashed(const FilePath& plugin_path, +void WebKitTestController::PluginCrashed(const base::FilePath& plugin_path, base::ProcessId plugin_pid) { DCHECK(CalledOnValidThread()); printer_->AddErrorMessage( diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h index ae4a5e0d..6c98cf9 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/webkit_test_controller.h @@ -77,7 +77,7 @@ class WebKitTestController : public base::NonThreadSafe, // True if the controller is ready for testing. bool PrepareForLayoutTest(const GURL& test_url, - const FilePath& current_working_directory, + const base::FilePath& current_working_directory, bool enable_pixel_dumping, const std::string& expected_pixel_hash); // True if the controller was reset successfully. @@ -99,7 +99,7 @@ class WebKitTestController : public base::NonThreadSafe, // WebContentsObserver implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void PluginCrashed(const FilePath& plugin_path, + virtual void PluginCrashed(const base::FilePath& plugin_path, base::ProcessId plugin_pid) OVERRIDE; virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; @@ -137,7 +137,7 @@ class WebKitTestController : public base::NonThreadSafe, scoped_ptr<WebKitTestResultPrinter> printer_; - FilePath current_working_directory_; + base::FilePath current_working_directory_; Shell* main_window_; diff --git a/content/shell/webkit_test_platform_support_linux.cc b/content/shell/webkit_test_platform_support_linux.cc index 0e32e4d..66dc17f 100644 --- a/content/shell/webkit_test_platform_support_linux.cc +++ b/content/shell/webkit_test_platform_support_linux.cc @@ -78,9 +78,9 @@ const char* const kFonts[] = { bool SetupFontConfig() { FcInit(); - FilePath base_path; + base::FilePath base_path; PathService::Get(base::DIR_MODULE, &base_path); - FilePath fonts_conf = base_path.Append(FILE_PATH_LITERAL("fonts.conf")); + base::FilePath fonts_conf = base_path.Append(FILE_PATH_LITERAL("fonts.conf")); FcConfig* font_config = FcConfigCreate(); if (!FcConfigParseAndLoad( @@ -119,7 +119,7 @@ bool SetupFontConfig() { "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf", "/usr/share/fonts/truetype/ttf-punjabi-fonts/lohit_pa.ttf"); - FilePath ahem_font = base_path.Append("AHEM____.TTF"); + base::FilePath ahem_font = base_path.Append("AHEM____.TTF"); if (!FcConfigAppFontAddFile( font_config, reinterpret_cast<const FcChar8*>(ahem_font.value().c_str()))) { diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc index 9a1d4b2..e66e693 100644 --- a/content/shell/webkit_test_runner.cc +++ b/content/shell/webkit_test_runner.cc @@ -216,7 +216,7 @@ void WebKitTestRunner::postDelayedTask(WebTask* task, long long ms) { WebString WebKitTestRunner::registerIsolatedFileSystem( const WebKit::WebVector<WebKit::WebString>& absolute_filenames) { - std::vector<FilePath> files; + std::vector<base::FilePath> files; for (size_t i = 0; i < absolute_filenames.size(); ++i) files.push_back(webkit_base::WebStringToFilePath(absolute_filenames[i])); std::string filesystem_id; @@ -233,9 +233,9 @@ long long WebKitTestRunner::getCurrentTimeInMillisecond() { WebString WebKitTestRunner::getAbsoluteWebStringFromUTF8Path( const std::string& utf8_path) { #if defined(OS_WIN) - FilePath path(UTF8ToWide(utf8_path)); + base::FilePath path(UTF8ToWide(utf8_path)); #else - FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path))); + base::FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path))); #endif if (!path.IsAbsolute()) { GURL base_url = @@ -247,7 +247,7 @@ WebString WebKitTestRunner::getAbsoluteWebStringFromUTF8Path( } WebURL WebKitTestRunner::localFileToDataURL(const WebURL& file_url) { - FilePath local_path; + base::FilePath local_path; if (!net::FileURLToFilePath(file_url, &local_path)) return WebURL(); @@ -270,7 +270,7 @@ WebURL WebKitTestRunner::rewriteLayoutTestsURL(const std::string& utf8_url) { if (utf8_url.compare(0, kPrefixLen, kPrefix, kPrefixLen)) return WebURL(GURL(utf8_url)); - FilePath replace_path = + base::FilePath replace_path = ShellRenderProcessObserver::GetInstance()->webkit_source_dir().Append( FILE_PATH_LITERAL("LayoutTests/")); #if defined(OS_WIN) @@ -615,9 +615,9 @@ void WebKitTestRunner::OnCaptureImageDump( } void WebKitTestRunner::OnSetCurrentWorkingDirectory( - const FilePath& current_working_directory) { + const base::FilePath& current_working_directory) { current_working_directory_ = current_working_directory; - std::vector<FilePath::StringType> components; + std::vector<base::FilePath::StringType> components; current_working_directory_.GetComponents(&components); for (unsigned i = 0; i < components.size(); ++i) { if (components[i] == FILE_PATH_LITERAL("loading")) diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h index 4d891eb..e394a1c 100644 --- a/content/shell/webkit_test_runner.h +++ b/content/shell/webkit_test_runner.h @@ -102,7 +102,8 @@ class WebKitTestRunner : public RenderViewObserver, // Message handlers. void OnCaptureTextDump(bool as_text, bool printing, bool recursive); void OnCaptureImageDump(const std::string& expected_pixel_hash); - void OnSetCurrentWorkingDirectory(const FilePath& current_working_directory); + void OnSetCurrentWorkingDirectory( + const base::FilePath& current_working_directory); SkCanvas* GetCanvas(); void PaintRect(const WebKit::WebRect& rect); @@ -111,7 +112,7 @@ class WebKitTestRunner : public RenderViewObserver, scoped_ptr<SkCanvas> canvas_; scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_; - FilePath current_working_directory_; + base::FilePath current_working_directory_; ::WebTestRunner::WebTestProxyBase* proxy_; diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index c02cd9e..74cee29 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -34,14 +34,14 @@ IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) { ContentBrowserTest::ContentBrowserTest() { #if defined(OS_MACOSX) // See comment in InProcessBrowserTest::InProcessBrowserTest(). - FilePath content_shell_path; + base::FilePath content_shell_path; CHECK(PathService::Get(base::FILE_EXE, &content_shell_path)); content_shell_path = content_shell_path.DirName(); content_shell_path = content_shell_path.Append( FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell")); CHECK(PathService::Override(base::FILE_EXE, content_shell_path)); #endif - CreateTestServer(FilePath(FILE_PATH_LITERAL("content/test/data"))); + CreateTestServer(base::FilePath(FILE_PATH_LITERAL("content/test/data"))); } ContentBrowserTest::~ContentBrowserTest() { @@ -66,7 +66,7 @@ void ContentBrowserTest::SetUp() { #if defined(OS_MACOSX) // See InProcessBrowserTest::PrepareTestCommandLine(). - FilePath subprocess_path; + base::FilePath subprocess_path; PathService::Get(base::FILE_EXE, &subprocess_path); subprocess_path = subprocess_path.DirName().DirName(); DCHECK_EQ(subprocess_path.BaseName().value(), "Contents"); diff --git a/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc index b8c64c3..b1c2e51 100644 --- a/content/test/content_browser_test_utils.cc +++ b/content/test/content_browser_test_utils.cc @@ -21,11 +21,11 @@ namespace content { -FilePath GetTestFilePath(const char* dir, const char* file) { - FilePath path; +base::FilePath GetTestFilePath(const char* dir, const char* file) { + base::FilePath path; PathService::Get(DIR_TEST_DATA, &path); - return path.Append( - FilePath().AppendASCII(dir).Append(FilePath().AppendASCII(file))); + return path.Append(base::FilePath().AppendASCII(dir).Append( + base::FilePath().AppendASCII(file))); } GURL GetTestUrl(const char* dir, const char* file) { diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index 4a853cf..aa1f362 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -112,7 +112,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate { } virtual bool AdjustChildProcessCommandLine( - CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE { + CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE { command_line->AppendSwitchPath(switches::kContentShellDataPath, temp_data_dir); command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); diff --git a/content/test/gpu/gpu_test_expectations_parser.cc b/content/test/gpu/gpu_test_expectations_parser.cc index debcb79..fd0d7d7 100644 --- a/content/test/gpu/gpu_test_expectations_parser.cc +++ b/content/test/gpu/gpu_test_expectations_parser.cc @@ -186,7 +186,8 @@ bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) { return rt; } -bool GPUTestExpectationsParser::LoadTestExpectations(const FilePath& path) { +bool GPUTestExpectationsParser::LoadTestExpectations( + const base::FilePath& path) { entries_.clear(); error_messages_.clear(); @@ -200,7 +201,7 @@ bool GPUTestExpectationsParser::LoadTestExpectations(const FilePath& path) { bool GPUTestExpectationsParser::LoadTestExpectations( GPUTestProfile profile) { - FilePath path; + base::FilePath path; if (!GetExpectationsPath(profile, &path)) return false; return LoadTestExpectations(path); @@ -504,7 +505,7 @@ void GPUTestExpectationsParser::PushErrorMessage( // static bool GPUTestExpectationsParser::GetExpectationsPath( - GPUTestProfile profile, FilePath* path) { + GPUTestProfile profile, base::FilePath* path) { DCHECK(path); bool rt = true; diff --git a/content/test/gpu/gpu_test_expectations_parser.h b/content/test/gpu/gpu_test_expectations_parser.h index 215096d..c80a280 100644 --- a/content/test/gpu/gpu_test_expectations_parser.h +++ b/content/test/gpu/gpu_test_expectations_parser.h @@ -33,7 +33,7 @@ class GPUTestExpectationsParser { // save all the entries. Otherwise, generate error messages. // Return true if parsing succeeds. bool LoadTestExpectations(const std::string& data); - bool LoadTestExpectations(const FilePath& path); + bool LoadTestExpectations(const base::FilePath& path); bool LoadTestExpectations(GPUTestProfile profile); // Query error messages from the last LoadTestExpectations() call. @@ -82,7 +82,7 @@ class GPUTestExpectationsParser { // Return false if an error occurs or the path does not exist. static bool GetExpectationsPath(GPUTestProfile profile, - FilePath* path); + base::FilePath* path); std::vector<GPUTestExpectationEntry> entries_; std::vector<std::string> error_messages_; diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 3d38e18..8b15d81 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -43,10 +43,10 @@ static const char kPlatformName[] = "chromium-android"; namespace content { namespace { -bool ReadExpectedResult(const FilePath& result_dir_path, +bool ReadExpectedResult(const base::FilePath& result_dir_path, const std::string test_case_file_name, std::string* expected_result_value) { - FilePath expected_result_path(result_dir_path); + base::FilePath expected_result_path(result_dir_path); expected_result_path = expected_result_path.AppendASCII(test_case_file_name); expected_result_path = expected_result_path.InsertBeforeExtension( FILE_PATH_LITERAL("-expected")); @@ -59,13 +59,15 @@ bool ReadExpectedResult(const FilePath& result_dir_path, } // namespace InProcessBrowserLayoutTest::InProcessBrowserLayoutTest( - const FilePath& test_parent_dir, const FilePath& test_case_dir) + const base::FilePath& test_parent_dir, const base::FilePath& test_case_dir) : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir), port_(-2) { } InProcessBrowserLayoutTest::InProcessBrowserLayoutTest( - const FilePath& test_parent_dir, const FilePath& test_case_dir, int port) + const base::FilePath& test_parent_dir, + const base::FilePath& test_case_dir, + int port) : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir), port_(port) { } @@ -76,9 +78,9 @@ InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() { } void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() { - FilePath src_dir; + base::FilePath src_dir; ASSERT_TRUE(PathService::Get(DIR_LAYOUT_TESTS, &src_dir)); - FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_); + base::FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_); ASSERT_TRUE(file_util::DirectoryExists(absolute_parent_dir)); layout_test_dir_ = absolute_parent_dir.Append(test_case_dir_); ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_)); @@ -192,10 +194,11 @@ void InProcessBrowserLayoutTest::RunLayoutTestInternal( std::string InProcessBrowserLayoutTest::SaveResults(const std::string& expected, const std::string& actual) { - FilePath cwd; + base::FilePath cwd; EXPECT_TRUE(file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &cwd)); - FilePath expected_filename = cwd.Append(FILE_PATH_LITERAL("expected.txt")); - FilePath actual_filename = cwd.Append(FILE_PATH_LITERAL("actual.txt")); + base::FilePath expected_filename = cwd.Append( + FILE_PATH_LITERAL("expected.txt")); + base::FilePath actual_filename = cwd.Append(FILE_PATH_LITERAL("actual.txt")); EXPECT_NE(-1, file_util::WriteFile(expected_filename, expected.c_str(), expected.size())); diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h index 583bac2..626ef5c 100644 --- a/content/test/layout_browsertest.h +++ b/content/test/layout_browsertest.h @@ -14,8 +14,8 @@ class WebKitTestController; class InProcessBrowserLayoutTest : public ContentBrowserTest { public: - explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir, - const FilePath& test_case_dir); + explicit InProcessBrowserLayoutTest(const base::FilePath& test_parent_dir, + const base::FilePath& test_case_dir); // Used when running HTTP layout tests. Starts the server in the constructor // and keeps it running through the lifetime of this test. This is done to // avoid flakiness in restarting the server while the port is still in use. @@ -23,8 +23,8 @@ class InProcessBrowserLayoutTest : public ContentBrowserTest { // recommended when possible, in case multiple tests are running at the same // time. For some tests this isn't possible though, because they use resources // that hardcode a specific port. - InProcessBrowserLayoutTest(const FilePath& test_parent_dir, - const FilePath& test_case_dir, + InProcessBrowserLayoutTest(const base::FilePath& test_parent_dir, + const base::FilePath& test_case_dir, int port); virtual ~InProcessBrowserLayoutTest(); @@ -44,12 +44,12 @@ class InProcessBrowserLayoutTest : public ContentBrowserTest { std::string SaveResults(const std::string& expected, const std::string& actual); - FilePath layout_test_dir_; - FilePath test_parent_dir_; - FilePath test_case_dir_; - FilePath rebase_result_dir_; - FilePath rebase_result_chromium_dir_; - FilePath rebase_result_win_dir_; + base::FilePath layout_test_dir_; + base::FilePath test_parent_dir_; + base::FilePath test_case_dir_; + base::FilePath rebase_result_dir_; + base::FilePath rebase_result_chromium_dir_; + base::FilePath rebase_result_win_dir_; int port_; // -2 means no port. -1 means random. scoped_ptr<LayoutTestHttpServer> test_http_server_; diff --git a/content/test/layout_test_http_server.cc b/content/test/layout_test_http_server.cc index 603a479..23c972a 100644 --- a/content/test/layout_test_http_server.cc +++ b/content/test/layout_test_http_server.cc @@ -20,14 +20,14 @@ namespace content { namespace { bool PrepareCommandLine(CommandLine* cmd_line) { - FilePath src_path; + base::FilePath src_path; if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_path)) return false; if (!GetPythonCommand(cmd_line)) return false; - FilePath script_path(src_path); + base::FilePath script_path(src_path); script_path = script_path.AppendASCII("third_party"); script_path = script_path.AppendASCII("WebKit"); script_path = script_path.AppendASCII("Tools"); @@ -40,7 +40,7 @@ bool PrepareCommandLine(CommandLine* cmd_line) { } // namespace -LayoutTestHttpServer::LayoutTestHttpServer(const FilePath& root_directory, +LayoutTestHttpServer::LayoutTestHttpServer(const base::FilePath& root_directory, int port) : root_directory_(root_directory), port_(port), @@ -67,7 +67,7 @@ bool LayoutTestHttpServer::Start() { root_directory_.value()); cmd_line.AppendArg("--port=" + base::IntToString(port_)); - FilePath layout_tests_dir; + base::FilePath layout_tests_dir; if (!PathService::Get(DIR_LAYOUT_TESTS, &layout_tests_dir)) return false; cmd_line.AppendArgNative(FILE_PATH_LITERAL("--layout_tests_dir=") + diff --git a/content/test/layout_test_http_server.h b/content/test/layout_test_http_server.h index 709c1ec..66035b6 100644 --- a/content/test/layout_test_http_server.h +++ b/content/test/layout_test_http_server.h @@ -21,7 +21,7 @@ namespace content { // a more lightweight net/test/test_server HTTP server. class LayoutTestHttpServer { public: - LayoutTestHttpServer(const FilePath& root_directory, int port); + LayoutTestHttpServer(const base::FilePath& root_directory, int port); ~LayoutTestHttpServer(); // Starts the server. Returns true on success. @@ -38,7 +38,7 @@ class LayoutTestHttpServer { int port() const { return port_; } private: - FilePath root_directory_; // Root directory of the server. + base::FilePath root_directory_; // Root directory of the server. int port_; // Port on which the server should listen. diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc index 79a77dc..404882c 100644 --- a/content/test/net/url_request_mock_http_job.cc +++ b/content/test/net/url_request_mock_http_job.cc @@ -15,7 +15,7 @@ #include "net/url_request/url_request_filter.h" const char kMockHostname[] = "mock.http"; -const FilePath::CharType kMockHeaderFileSuffix[] = +const base::FilePath::CharType kMockHeaderFileSuffix[] = FILE_PATH_LITERAL(".mock-http-headers"); namespace content { @@ -28,7 +28,7 @@ class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { // contents of the file at |base_path|. When |map_all_requests_to_base_path| // is false, |base_path| is the file path leading to the root of the directory // to use as the root of the HTTP server. - explicit ProtocolHandler(const FilePath& base_path, + explicit ProtocolHandler(const base::FilePath& base_path, bool map_all_requests_to_base_path) : base_path_(base_path), map_all_requests_to_base_path_(map_all_requests_to_base_path) {} @@ -43,19 +43,19 @@ class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { } private: - FilePath GetOnDiskPath(net::URLRequest* request) const { + base::FilePath GetOnDiskPath(net::URLRequest* request) const { // Conceptually we just want to "return base_path_ + request->url().path()". // But path in the request URL is in URL space (i.e. %-encoded spaces). // So first we convert base FilePath to a URL, then append the URL // path to that, and convert the final URL back to a FilePath. GURL file_url(net::FilePathToFileURL(base_path_)); std::string url = file_url.spec() + request->url().path(); - FilePath file_path; + base::FilePath file_path; net::FileURLToFilePath(GURL(url), &file_path); return file_path; } - const FilePath base_path_; + const base::FilePath base_path_; const bool map_all_requests_to_base_path_; DISALLOW_COPY_AND_ASSIGN(ProtocolHandler); @@ -64,7 +64,7 @@ class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { } // namespace // static -void URLRequestMockHTTPJob::AddUrlHandler(const FilePath& base_path) { +void URLRequestMockHTTPJob::AddUrlHandler(const base::FilePath& base_path) { // Add kMockHostname to net::URLRequestFilter. net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance(); filter->AddHostnameProtocolHandler("http", kMockHostname, @@ -74,7 +74,7 @@ void URLRequestMockHTTPJob::AddUrlHandler(const FilePath& base_path) { // static void URLRequestMockHTTPJob::AddHostnameToFileHandler( const std::string& hostname, - const FilePath& file_path) { + const base::FilePath& file_path) { net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance(); filter->AddHostnameProtocolHandler("http", hostname, scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>( @@ -83,7 +83,7 @@ void URLRequestMockHTTPJob::AddHostnameToFileHandler( } // static -GURL URLRequestMockHTTPJob::GetMockUrl(const FilePath& path) { +GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) { std::string url = "http://"; url.append(kMockHostname); url.append("/"); @@ -94,7 +94,7 @@ GURL URLRequestMockHTTPJob::GetMockUrl(const FilePath& path) { } // static -GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) { +GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const base::FilePath& path) { std::string url = chrome::kViewSourceScheme; url.append(":"); url.append(GetMockUrl(path).spec()); @@ -103,7 +103,7 @@ GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) { // static scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> -URLRequestMockHTTPJob::CreateProtocolHandler(const FilePath& base_path) { +URLRequestMockHTTPJob::CreateProtocolHandler(const base::FilePath& base_path) { return scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>( new ProtocolHandler(base_path, false)); } @@ -111,7 +111,7 @@ URLRequestMockHTTPJob::CreateProtocolHandler(const FilePath& base_path) { URLRequestMockHTTPJob::URLRequestMockHTTPJob( net::URLRequest* request, net::NetworkDelegate* network_delegate, - const FilePath& file_path) + const base::FilePath& file_path) : net::URLRequestFileJob(request, network_delegate, file_path) { } URLRequestMockHTTPJob::~URLRequestMockHTTPJob() { } @@ -136,7 +136,8 @@ void URLRequestMockHTTPJob::GetResponseInfoConst( // from tests, so allow these IO operations to happen on any thread. base::ThreadRestrictions::ScopedAllowIO allow_io; - FilePath header_file = FilePath(file_path_.value() + kMockHeaderFileSuffix); + base::FilePath header_file = + base::FilePath(file_path_.value() + kMockHeaderFileSuffix); std::string raw_headers; if (!file_util::ReadFileToString(header_file, &raw_headers)) return; diff --git a/content/test/net/url_request_prepackaged_interceptor.cc b/content/test/net/url_request_prepackaged_interceptor.cc index 167f9c7..11ad222 100644 --- a/content/test/net/url_request_prepackaged_interceptor.cc +++ b/content/test/net/url_request_prepackaged_interceptor.cc @@ -22,7 +22,7 @@ class URLRequestPrepackagedJob : public net::URLRequestFileJob { public: URLRequestPrepackagedJob(net::URLRequest* request, net::NetworkDelegate* network_delegate, - const FilePath& file_path) + const base::FilePath& file_path) : net::URLRequestFileJob(request, network_delegate, file_path) {} virtual int GetResponseCode() const { return 200; } @@ -56,7 +56,7 @@ class URLRequestPrepackagedInterceptor::Delegate // hostname of |url| must be "localhost" to avoid DNS lookups, and the scheme // must be "http". void SetResponse(const GURL& url, - const FilePath& path, + const base::FilePath& path, bool ignore_query) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // It's ok to do a blocking disk access on this thread; this class @@ -77,7 +77,7 @@ class URLRequestPrepackagedInterceptor::Delegate } private: - typedef std::map<GURL, FilePath> ResponseMap; + typedef std::map<GURL, base::FilePath> ResponseMap; // When computing matches, this ignores the query parameters of the url. virtual net::URLRequestJob* MaybeCreateJob( @@ -135,7 +135,7 @@ URLRequestPrepackagedInterceptor::~URLRequestPrepackagedInterceptor() { } void URLRequestPrepackagedInterceptor::SetResponse(const GURL& url, - const FilePath& path) { + const base::FilePath& path) { CHECK_EQ("http", url.scheme()); CHECK_EQ("localhost", url.host()); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, @@ -146,7 +146,7 @@ void URLRequestPrepackagedInterceptor::SetResponse(const GURL& url, void URLRequestPrepackagedInterceptor::SetResponseIgnoreQuery( const GURL& url, - const FilePath& path) { + const base::FilePath& path) { CHECK_EQ("http", url.scheme()); CHECK_EQ("localhost", url.host()); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, diff --git a/content/test/test_content_browser_client.cc b/content/test/test_content_browser_client.cc index de7be06..c1c054b 100644 --- a/content/test/test_content_browser_client.cc +++ b/content/test/test_content_browser_client.cc @@ -31,7 +31,7 @@ WebContentsView* TestContentBrowserClient::OverrideCreateWebContentsView( #endif } -FilePath TestContentBrowserClient::GetDefaultDownloadDirectory() { +base::FilePath TestContentBrowserClient::GetDefaultDownloadDirectory() { if (!download_dir_.IsValid()) { bool result = download_dir_.CreateUniqueTempDir(); CHECK(result); diff --git a/content/test/test_content_browser_client.h b/content/test/test_content_browser_client.h index 2708904..b8b9276 100644 --- a/content/test/test_content_browser_client.h +++ b/content/test/test_content_browser_client.h @@ -23,7 +23,7 @@ class TestContentBrowserClient : public ContentBrowserClient { virtual WebContentsView* OverrideCreateWebContentsView( WebContents* web_contents, RenderViewHostDelegateView** render_view_host_delegate_view) OVERRIDE; - virtual FilePath GetDefaultDownloadDirectory() OVERRIDE; + virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE; private: // Temporary directory for GetDefaultDownloadDirectory. diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc index b111de4..4b0f72a 100644 --- a/content/test/test_content_client.cc +++ b/content/test/test_content_client.cc @@ -16,7 +16,7 @@ TestContentClient::TestContentClient() : data_pack_(ui::SCALE_FACTOR_100P) { // content_resources.pak is not built on iOS as it is not required. #if !defined(OS_IOS) - FilePath content_resources_pack_path; + base::FilePath content_resources_pack_path; #if defined(OS_ANDROID) // on Android all pak files are inside the paks folder. PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path); diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc index 571c4a6..13f79c8 100644 --- a/content/test/webrtc_audio_device_test.cc +++ b/content/test/webrtc_audio_device_test.cc @@ -336,8 +336,8 @@ void WebRTCAudioDeviceTest::WaitForMessageLoopCompletion( } std::string WebRTCAudioDeviceTest::GetTestDataPath( - const FilePath::StringType& file_name) { - FilePath path; + const base::FilePath::StringType& file_name) { + base::FilePath path; EXPECT_TRUE(PathService::Get(DIR_TEST_DATA, &path)); path = path.Append(file_name); EXPECT_TRUE(file_util::PathExists(path)); diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h index 2e52e94b..3f10bb6 100644 --- a/content/test/webrtc_audio_device_test.h +++ b/content/test/webrtc_audio_device_test.h @@ -149,7 +149,7 @@ class WebRTCAudioDeviceTest : public ::testing::Test, public IPC::Listener { return *media_internals_.get(); } - std::string GetTestDataPath(const FilePath::StringType& file_name); + std::string GetTestDataPath(const base::FilePath::StringType& file_name); scoped_ptr<ReplaceContentClientRenderer> saved_content_renderer_; MessageLoopForUI message_loop_; diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 607fa30..69b743a 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -96,7 +96,7 @@ void UtilityThreadImpl::OnBatchModeFinished() { #if defined(OS_POSIX) void UtilityThreadImpl::OnLoadPlugins( - const std::vector<FilePath>& plugin_paths) { + const std::vector<base::FilePath>& plugin_paths) { webkit::npapi::PluginList* plugin_list = webkit::npapi::PluginList::Singleton(); diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index d52211b..29fdc62 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -262,14 +262,14 @@ WebString WorkerWebKitPlatformSupportImpl::mimeTypeFromFile( const WebString& file_path) { std::string mime_type; SendSyncMessageFromAnyThread(new MimeRegistryMsg_GetMimeTypeFromFile( - FilePath(webkit_base::WebStringToFilePathString(file_path)), + base::FilePath(webkit_base::WebStringToFilePathString(file_path)), &mime_type)); return ASCIIToUTF16(mime_type); } WebString WorkerWebKitPlatformSupportImpl::preferredExtensionForMIMEType( const WebString& mime_type) { - FilePath::StringType file_extension; + base::FilePath::StringType file_extension; SendSyncMessageFromAnyThread( new MimeRegistryMsg_GetPreferredExtensionForMimeType( UTF16ToASCII(mime_type), &file_extension)); diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 7347437..6175d02 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -295,7 +295,7 @@ IPC_STRUCT_TRAITS_END() // These are from the browser to the plugin. // Loads the given plugin. IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin, - FilePath /* path */, + base::FilePath /* path */, ppapi::PpapiPermissions /* permissions */) // Creates a channel to talk to a renderer. The plugin will respond with @@ -359,7 +359,7 @@ IPC_MESSAGE_CONTROL1(PpapiMsg_SetNetworkState, // for Flash. IPC_MESSAGE_CONTROL2(PpapiMsg_GetSitesWithData, uint32 /* request_id */, - FilePath /* plugin_data_path */) + base::FilePath /* plugin_data_path */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_GetSitesWithDataResult, uint32 /* request_id */, std::vector<std::string> /* sites */) @@ -369,7 +369,7 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_GetSitesWithDataResult, // for Flash. IPC_MESSAGE_CONTROL5(PpapiMsg_ClearSiteData, uint32 /* request_id */, - FilePath /* plugin_data_path */, + base::FilePath /* plugin_data_path */, std::string /* site */, uint64 /* flags */, uint64 /* max_age */) @@ -379,14 +379,14 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_ClearSiteDataResult, IPC_MESSAGE_CONTROL2(PpapiMsg_DeauthorizeContentLicenses, uint32 /* request_id */, - FilePath /* plugin_data_path */) + base::FilePath /* plugin_data_path */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_DeauthorizeContentLicensesResult, uint32 /* request_id */, bool /* success */) IPC_MESSAGE_CONTROL3(PpapiMsg_GetPermissionSettings, uint32 /* request_id */, - FilePath /* plugin_data_path */, + base::FilePath /* plugin_data_path */, PP_Flash_BrowserOperations_SettingType /* setting_type */) IPC_MESSAGE_CONTROL4( PpapiHostMsg_GetPermissionSettingsResult, @@ -397,7 +397,7 @@ IPC_MESSAGE_CONTROL4( IPC_MESSAGE_CONTROL5(PpapiMsg_SetDefaultPermission, uint32 /* request_id */, - FilePath /* plugin_data_path */, + base::FilePath /* plugin_data_path */, PP_Flash_BrowserOperations_SettingType /* setting_type */, PP_Flash_BrowserOperations_Permission /* permission */, bool /* clear_site_specific */) @@ -407,7 +407,7 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetDefaultPermissionResult, IPC_MESSAGE_CONTROL4(PpapiMsg_SetSitePermission, uint32 /* request_id */, - FilePath /* plugin_data_path */, + base::FilePath /* plugin_data_path */, PP_Flash_BrowserOperations_SettingType /* setting_type */, ppapi::FlashSiteSettings /* sites */) IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetSitePermissionResult, diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc index ea792e6..e457503 100644 --- a/ppapi/proxy/ppapi_param_traits.cc +++ b/ppapi/proxy/ppapi_param_traits.cc @@ -575,7 +575,7 @@ bool ParamTraits<ppapi::PepperFilePath>::Read(const Message* m, PickleIterator* iter, param_type* p) { unsigned domain; - FilePath path; + base::FilePath path; if (!ReadParam(m, iter, &domain) || !ReadParam(m, iter, &path)) return false; if (domain > ppapi::PepperFilePath::DOMAIN_MAX_VALID) diff --git a/ppapi/shared_impl/dir_contents.h b/ppapi/shared_impl/dir_contents.h index 98c29f3..0c32a03 100644 --- a/ppapi/shared_impl/dir_contents.h +++ b/ppapi/shared_impl/dir_contents.h @@ -13,7 +13,7 @@ namespace ppapi { struct DirEntry { - FilePath name; + base::FilePath name; bool is_dir; }; diff --git a/ppapi/shared_impl/file_path.h b/ppapi/shared_impl/file_path.h index 3d850f9..ff47549 100644 --- a/ppapi/shared_impl/file_path.h +++ b/ppapi/shared_impl/file_path.h @@ -26,14 +26,14 @@ class PPAPI_SHARED_EXPORT PepperFilePath { }; PepperFilePath(); - PepperFilePath(Domain d, const FilePath& p); + PepperFilePath(Domain d, const base::FilePath& p); Domain domain() const { return domain_; } - const FilePath& path() const { return path_; } + const base::FilePath& path() const { return path_; } private: Domain domain_; - FilePath path_; + base::FilePath path_; }; } // namespace ppapi |