diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 04:49:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 04:49:30 +0000 |
| commit | 6d4b67a4b50d73d5001aec99014ac40bc504871a (patch) | |
| tree | 4f85ee41ed1fad3dc68381e0fe4f23dbeecf1364 | |
| parent | 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb (diff) | |
| download | chromium_src-6d4b67a4b50d73d5001aec99014ac40bc504871a.zip chromium_src-6d4b67a4b50d73d5001aec99014ac40bc504871a.tar.gz chromium_src-6d4b67a4b50d73d5001aec99014ac40bc504871a.tar.bz2 | |
Rename FilePath -> base::FilePath in various toplevel directories
Review URL: https://codereview.chromium.org/12211108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181639 0039d316-1c4b-4281-b951-d872f2087c98
68 files changed, 289 insertions, 278 deletions
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc index 8043adc..ccef830 100644 --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc @@ -41,7 +41,7 @@ class AwResourceContext : public content::ResourceContext { } // namespace AwBrowserContext::AwBrowserContext( - const FilePath path, + const base::FilePath path, GeolocationPermissionFactoryFn* geolocation_permission_factory) : context_storage_path_(path), geolocation_permission_factory_(geolocation_permission_factory) { @@ -94,7 +94,7 @@ net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext( net::URLRequestContextGetter* AwBrowserContext::CreateRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory, scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> blob_protocol_handler, @@ -110,7 +110,7 @@ AwBrowserContext::CreateRequestContextForStoragePartition( return url_request_context_getter_.get(); } -FilePath AwBrowserContext::GetPath() { +base::FilePath AwBrowserContext::GetPath() { return context_storage_path_; } @@ -141,7 +141,7 @@ AwBrowserContext::GetMediaRequestContextForRenderProcess( net::URLRequestContextGetter* AwBrowserContext::GetMediaRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory) { return GetRequestContext(); } diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h index b7f1b37..4d0bd66 100644 --- a/android_webview/browser/aw_browser_context.h +++ b/android_webview/browser/aw_browser_context.h @@ -40,7 +40,7 @@ class AwBrowserContext : public content::BrowserContext, public: AwBrowserContext( - const FilePath path, + const base::FilePath path, GeolocationPermissionFactoryFn* geolocation_permission_factory); virtual ~AwBrowserContext(); @@ -70,7 +70,7 @@ class AwBrowserContext : public content::BrowserContext, scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> chrome_devtools_protocol_handler); net::URLRequestContextGetter* CreateRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory, scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> blob_protocol_handler, @@ -84,7 +84,7 @@ class AwBrowserContext : public content::BrowserContext, chrome_devtools_protocol_handler); // content::BrowserContext implementation. - virtual FilePath GetPath() OVERRIDE; + virtual base::FilePath GetPath() OVERRIDE; virtual bool IsOffTheRecord() const OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( @@ -94,7 +94,7 @@ class AwBrowserContext : public content::BrowserContext, int renderer_child_id) OVERRIDE; virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( - const FilePath& partition_path, bool in_memory) OVERRIDE; + const base::FilePath& partition_path, bool in_memory) OVERRIDE; virtual content::ResourceContext* GetResourceContext() OVERRIDE; virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() OVERRIDE; @@ -110,7 +110,7 @@ class AwBrowserContext : public content::BrowserContext, private: // The file path where data for this context is persisted. - FilePath context_storage_path_; + base::FilePath context_storage_path_; scoped_refptr<AwURLRequestContextGetter> url_request_context_getter_; GeolocationPermissionFactoryFn* geolocation_permission_factory_; diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc index 40ff17b..71c35e9 100644 --- a/android_webview/browser/aw_browser_main_parts.cc +++ b/android_webview/browser/aw_browser_main_parts.cc @@ -61,7 +61,7 @@ int AwBrowserMainParts::PreCreateThreads() { // that, seed the ResourceBundle instance with a non-string, locale // independant pak. Until we no longer rely on paks for strings, // load an extra data pack separately that has the strings in it. - FilePath pak_path; + base::FilePath pak_path; PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( pak_path.AppendASCII("webviewchromium_strings.pak"), diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 8bd40a4..4662e74 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -48,7 +48,7 @@ AwContentBrowserClient::AwContentBrowserClient( ViewDelegateFactoryFn* view_delegate_factory, GeolocationPermissionFactoryFn* geolocation_permission_factory) : view_delegate_factory_(view_delegate_factory) { - FilePath user_data_dir; + base::FilePath user_data_dir; if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) { NOTREACHED() << "Failed to get app data directory for Android WebView"; } @@ -124,7 +124,7 @@ AwContentBrowserClient::CreateRequestContext( net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContextForStoragePartition( content::BrowserContext* browser_context, - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory, scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> blob_protocol_handler, @@ -360,13 +360,13 @@ void AwContentBrowserClient::ClearCookies(content::RenderViewHost* rvh) { NOTIMPLEMENTED(); } -FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() { +base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() { // Android WebView does not currently use the Chromium downloads system. // Download requests are cancelled immedately when recognized; see // AwResourceDispatcherHost::CreateResourceHandlerForDownload. However the // download system still tries to start up and calls this before recognizing // the request has been cancelled. - return FilePath(); + return base::FilePath(); } std::string AwContentBrowserClient::GetDefaultDownloadName() { diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index 59a1c9e..9ff4f6c 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -53,7 +53,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { chrome_devtools_protocol_handler) OVERRIDE; virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( content::BrowserContext* browser_context, - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory, scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> blob_protocol_handler, @@ -150,7 +150,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { virtual void ClearInspectorSettings(content::RenderViewHost* rvh) OVERRIDE; virtual void ClearCache(content::RenderViewHost* rvh) OVERRIDE; virtual void ClearCookies(content::RenderViewHost* rvh) OVERRIDE; - virtual FilePath GetDefaultDownloadDirectory() OVERRIDE; + virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE; virtual std::string GetDefaultDownloadName() OVERRIDE; virtual void DidCreatePpapiPlugin( content::BrowserPpapiHost* browser_host) OVERRIDE; diff --git a/android_webview/browser/aw_download_manager_delegate.cc b/android_webview/browser/aw_download_manager_delegate.cc index 9eca137..0c3397a 100644 --- a/android_webview/browser/aw_download_manager_delegate.cc +++ b/android_webview/browser/aw_download_manager_delegate.cc @@ -19,10 +19,10 @@ bool AwDownloadManagerDelegate::DetermineDownloadTarget( // Note this cancel is independent of the URLRequest cancel in // AwResourceDispatcherHostDelegate::DownloadStarting. The request // could have already finished by the time DownloadStarting is called. - callback.Run(FilePath() /* Empty file path for cancel */, + callback.Run(base::FilePath() /* Empty file path for cancel */, content::DownloadItem::TARGET_DISPOSITION_OVERWRITE, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, - FilePath()); + base::FilePath()); return true; } diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index a0438a31d..1fd2ec1 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -584,7 +584,7 @@ void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) { namespace { void GenerateMHTMLCallback(ScopedJavaGlobalRef<jobject>* callback, - const FilePath& path, int64 size) { + const base::FilePath& path, int64 size) { JNIEnv* env = AttachCurrentThread(); // Android files are UTF8, so the path conversion below is safe. Java_AwContents_generateMHTMLCallback( @@ -599,7 +599,7 @@ void AwContents::GenerateMHTML(JNIEnv* env, jobject obj, ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>(); j_callback->Reset(env, callback); web_contents_->GenerateMHTML( - FilePath(ConvertJavaStringToUTF8(env, jpath)), + base::FilePath(ConvertJavaStringToUTF8(env, jpath)), base::Bind(&GenerateMHTMLCallback, base::Owned(j_callback))); } diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc index 626a833..1ebda4f 100644 --- a/ash/system/drive/tray_drive.cc +++ b/ash/system/drive/tray_drive.cc @@ -141,7 +141,7 @@ class DriveDetailedView : public TrayDetailsView, RowView(DriveDetailedView* parent, ash::DriveOperationStatus::OperationState state, double progress, - const FilePath& file_path) + const base::FilePath& file_path) : HoverHighlightView(parent), container_(parent), status_img_(NULL), @@ -259,7 +259,7 @@ class DriveDetailedView : public TrayDetailsView, views::View* label_container_; views::ProgressBar* progress_bar_; views::ImageButton* cancel_button_; - FilePath file_path_; + base::FilePath file_path_; DISALLOW_COPY_AND_ASSIGN(RowView); }; @@ -286,7 +286,7 @@ class DriveDetailedView : public TrayDetailsView, return failed_img_; } - virtual void OnCancelOperation(const FilePath& file_path) { + virtual void OnCancelOperation(const base::FilePath& file_path) { SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); delegate->CancelDriveOperation(file_path); } @@ -296,14 +296,14 @@ class DriveDetailedView : public TrayDetailsView, CreateScrollableList(); // Apply the update. - std::set<FilePath> new_set; + std::set<base::FilePath> new_set; bool item_list_changed = false; for (DriveOperationStatusList::const_iterator it = list->begin(); it != list->end(); ++it) { const DriveOperationStatus& operation = *it; new_set.insert(operation.file_path); - std::map<FilePath, RowView*>::iterator existing_item = + std::map<base::FilePath, RowView*>::iterator existing_item = update_map_.find(operation.file_path); if (existing_item != update_map_.end()) { @@ -323,8 +323,8 @@ class DriveDetailedView : public TrayDetailsView, // Remove items from the list that haven't been added or modified with this // update batch. - std::set<FilePath> remove_set; - for (std::map<FilePath, RowView*>::iterator update_iter = + std::set<base::FilePath> remove_set; + for (std::map<base::FilePath, RowView*>::iterator update_iter = update_map_.begin(); update_iter != update_map_.end(); ++update_iter) { if (new_set.find(update_iter->first) == new_set.end()) { @@ -332,7 +332,7 @@ class DriveDetailedView : public TrayDetailsView, } } - for (std::set<FilePath>::iterator removed_iter = remove_set.begin(); + for (std::set<base::FilePath>::iterator removed_iter = remove_set.begin(); removed_iter != remove_set.end(); ++removed_iter) { delete update_map_[*removed_iter]; update_map_.erase(*removed_iter); @@ -370,7 +370,7 @@ class DriveDetailedView : public TrayDetailsView, } // Maps operation entries to their file paths. - std::map<FilePath, RowView*> update_map_; + std::map<base::FilePath, RowView*> update_map_; views::View* settings_; gfx::ImageSkia* in_progress_img_; gfx::ImageSkia* done_img_; diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 6f6cab8..2e8dd4f4 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -70,7 +70,7 @@ struct ASH_EXPORT DriveOperationStatus { ~DriveOperationStatus(); // File path. - FilePath file_path; + base::FilePath file_path; // Current operation completion progress [0.0 - 1.0]. double progress; OperationType type; @@ -220,7 +220,7 @@ class SystemTrayDelegate { virtual void ActivateIMEProperty(const std::string& key) = 0; // Cancels ongoing drive operation. - virtual void CancelDriveOperation(const FilePath& file_path) = 0; + virtual void CancelDriveOperation(const base::FilePath& file_path) = 0; // Returns information about the ongoing drive operations. virtual void GetDriveOperationStatusList( diff --git a/ash/system/tray/test_system_tray_delegate.cc b/ash/system/tray/test_system_tray_delegate.cc index 95f9100..bda2fbf 100644 --- a/ash/system/tray/test_system_tray_delegate.cc +++ b/ash/system/tray/test_system_tray_delegate.cc @@ -197,7 +197,7 @@ void TestSystemTrayDelegate::SwitchIME(const std::string& ime_id) { void TestSystemTrayDelegate::ActivateIMEProperty(const std::string& key) { } -void TestSystemTrayDelegate::CancelDriveOperation(const FilePath&) { +void TestSystemTrayDelegate::CancelDriveOperation(const base::FilePath&) { } void TestSystemTrayDelegate::GetDriveOperationStatusList( diff --git a/ash/system/tray/test_system_tray_delegate.h b/ash/system/tray/test_system_tray_delegate.h index 16bc989..9134aae 100644 --- a/ash/system/tray/test_system_tray_delegate.h +++ b/ash/system/tray/test_system_tray_delegate.h @@ -60,7 +60,7 @@ class TestSystemTrayDelegate : public SystemTrayDelegate { virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE; virtual void SwitchIME(const std::string& ime_id) OVERRIDE; virtual void ActivateIMEProperty(const std::string& key) OVERRIDE; - virtual void CancelDriveOperation(const FilePath&) OVERRIDE; + virtual void CancelDriveOperation(const base::FilePath&) OVERRIDE; virtual void GetDriveOperationStatusList( ash::DriveOperationStatusList*) OVERRIDE; virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, diff --git a/ash/test/test_suite_init.mm b/ash/test/test_suite_init.mm index df14114..d60b3e2 100644 --- a/ash/test/test_suite_init.mm +++ b/ash/test/test_suite_init.mm @@ -16,7 +16,7 @@ namespace test { void OverrideFrameworkBundle() { // Look in the AuraShell.app directory for resources. - FilePath path; + base::FilePath path; PathService::Get(base::DIR_EXE, &path); path = path.Append(FILE_PATH_LITERAL("AuraShell.app")); base::mac::SetOverrideFrameworkBundlePath(path); diff --git a/cc/gl_renderer_pixeltest.cc b/cc/gl_renderer_pixeltest.cc index 74ec0b9..5c505aa 100644 --- a/cc/gl_renderer_pixeltest.cc +++ b/cc/gl_renderer_pixeltest.cc @@ -60,7 +60,7 @@ class GLRendererPixelTest : public testing::Test { resource_provider_.get()); } - bool PixelsMatchReference(FilePath ref_file, gfx::Rect viewport_rect) { + bool PixelsMatchReference(base::FilePath ref_file, gfx::Rect viewport_rect) { SkBitmap bitmap; bitmap.setConfig(SkBitmap::kARGB_8888_Config, viewport_rect.width(), viewport_rect.height()); @@ -68,7 +68,7 @@ class GLRendererPixelTest : public testing::Test { unsigned char* pixels = static_cast<unsigned char*>(bitmap.getPixels()); renderer_->getFramebufferPixels(pixels, viewport_rect); - FilePath test_data_dir; + base::FilePath test_data_dir; if (!PathService::Get(cc::DIR_TEST_DATA, &test_data_dir)) return false; @@ -144,8 +144,9 @@ TEST_F(GLRendererPixelTest, simpleGreenRect) { renderer_->drawFrame(pass_list); - EXPECT_TRUE(PixelsMatchReference(FilePath(FILE_PATH_LITERAL("green.png")), - rect)); + EXPECT_TRUE(PixelsMatchReference( + base::FilePath(FILE_PATH_LITERAL("green.png")), + rect)); } TEST_F(GLRendererPixelTest, RenderPassChangesSize) { @@ -188,7 +189,7 @@ TEST_F(GLRendererPixelTest, RenderPassChangesSize) { renderer_->drawFrame(pass_list); EXPECT_TRUE(PixelsMatchReference( - FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect)); + base::FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect)); } #endif diff --git a/cc/layer_tree_host_perftest.cc b/cc/layer_tree_host_perftest.cc index a6827cc..c8e82ab 100644 --- a/cc/layer_tree_host_perftest.cc +++ b/cc/layer_tree_host_perftest.cc @@ -77,9 +77,9 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest { void readTestFile(std::string name) { test_name_ = name; - FilePath test_data_dir; + base::FilePath test_data_dir; ASSERT_TRUE(PathService::Get(cc::DIR_TEST_DATA, &test_data_dir)); - FilePath json_file = test_data_dir.AppendASCII(name + ".json"); + base::FilePath json_file = test_data_dir.AppendASCII(name + ".json"); ASSERT_TRUE(file_util::ReadFileToString(json_file, &json_)); } diff --git a/cc/test/paths.cc b/cc/test/paths.cc index a8f2e2f..b921cca 100644 --- a/cc/test/paths.cc +++ b/cc/test/paths.cc @@ -10,8 +10,8 @@ namespace cc { -bool PathProvider(int key, FilePath* result) { - FilePath cur; +bool PathProvider(int key, base::FilePath* result) { + base::FilePath cur; switch (key) { // The following are only valid in the development environment, and // will fail if executed from an installed executable (because the diff --git a/cc/test/pixel_test_utils.cc b/cc/test/pixel_test_utils.cc index dbb1191..d1101b3 100644 --- a/cc/test/pixel_test_utils.cc +++ b/cc/test/pixel_test_utils.cc @@ -11,7 +11,7 @@ namespace cc { -bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path) { +bool WritePNGFile(const SkBitmap& bitmap, const base::FilePath& file_path) { std::vector<unsigned char> png_data; const bool discard_transparency = true; if (gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, @@ -25,7 +25,7 @@ bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path) { return false; } -bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap) { +bool ReadPNGFile(const base::FilePath& file_path, SkBitmap* bitmap) { DCHECK(bitmap); std::string png_data; return file_util::ReadFileToString(file_path, &png_data) && @@ -34,7 +34,7 @@ bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap) { bitmap); } -bool IsSameAsPNGFile(const SkBitmap& gen_bmp, FilePath ref_img_path) { +bool IsSameAsPNGFile(const SkBitmap& gen_bmp, base::FilePath ref_img_path) { SkBitmap ref_bmp; if (!ReadPNGFile(ref_img_path, &ref_bmp)) { LOG(ERROR) << "Cannot read reference image: " << ref_img_path.value(); diff --git a/cc/test/pixel_test_utils.h b/cc/test/pixel_test_utils.h index 3fa990d6..5f8db47 100644 --- a/cc/test/pixel_test_utils.h +++ b/cc/test/pixel_test_utils.h @@ -13,15 +13,15 @@ namespace cc { // Encodes a bitmap into a PNG and write to disk. Returns true on success. The // parent directory does not have to exist. -bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path); +bool WritePNGFile(const SkBitmap& bitmap, const base::FilePath& file_path); // Reads and decodes a PNG image to a bitmap. Returns true on success. The PNG // should have been encoded using |gfx::PNGCodec::Encode|. -bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap); +bool ReadPNGFile(const base::FilePath& file_path, SkBitmap* bitmap); // Compares with a PNG file on disk, and returns true if it is the same as // the given image. |ref_img_path| is absolute. -bool IsSameAsPNGFile(const SkBitmap& gen_bmp, FilePath ref_img_path); +bool IsSameAsPNGFile(const SkBitmap& gen_bmp, base::FilePath ref_img_path); } // namespace cc diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 60919a1..057b3e5 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -390,7 +390,7 @@ END_MSG_MAP() protected: virtual void GetProfilePath(const std::wstring& profile_name, - FilePath* profile_path) { + base::FilePath* profile_path) { bool is_IE = (lstrcmpi(profile_name.c_str(), kIexploreProfileName) == 0) || (lstrcmpi(profile_name.c_str(), kRundllProfileName) == 0); // Browsers without IDeleteBrowsingHistory in non-priv mode diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 8cf778b..633a1ae 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -695,7 +695,7 @@ bool ChromeFrameAutomationClient::InitiateNavigation( // referrer to be dropped or something worse. GURL referrer_gurl(referrer.c_str()); if (!chrome_launch_params_) { - FilePath profile_path; + base::FilePath profile_path; chrome_launch_params_ = new ChromeFrameLaunchParams(parsed_url, referrer_gurl, profile_path, L"", SimpleResourceLoader::GetLanguage(), false, false, route_all_top_level_navigations_, diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index c8d5ad0..f6db526 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -107,7 +107,7 @@ class ChromeFrameLaunchParams : // NOLINT public base::RefCountedThreadSafe<ChromeFrameLaunchParams> { public: ChromeFrameLaunchParams(const GURL& url, const GURL& referrer, - const FilePath& profile_path, + const base::FilePath& profile_path, const std::wstring& profile_name, const std::wstring& language, bool incognito, bool widget_mode, @@ -149,7 +149,7 @@ class ChromeFrameLaunchParams : // NOLINT referrer_ = referrer; } - const FilePath& profile_path() const { + const base::FilePath& profile_path() const { return profile_path_; } @@ -194,7 +194,7 @@ class ChromeFrameLaunchParams : // NOLINT int launch_timeout_; GURL url_; GURL referrer_; - FilePath profile_path_; + base::FilePath profile_path_; std::wstring profile_name_; std::wstring language_; bool version_check_; diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h index 5182698..8eeeee6 100644 --- a/chrome_frame/chrome_frame_plugin.h +++ b/chrome_frame/chrome_frame_plugin.h @@ -74,12 +74,12 @@ END_MSG_MAP() // We don't want to do incognito when privileged, since we're // running in browser chrome or some other privileged context. bool incognito_mode = !is_privileged() && incognito; - FilePath profile_path; + base::FilePath profile_path; GetProfilePath(profile_name, &profile_path); // The profile name could change based on the browser version. For e.g. for // IE6/7 the profile is created in a different folder whose last component // is Google Chrome Frame. - FilePath actual_profile_name = profile_path.BaseName(); + base::FilePath actual_profile_name = profile_path.BaseName(); launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path, actual_profile_name.value(), SimpleResourceLoader::GetLanguage(), incognito_mode, is_widget_mode, route_all_top_level_navigations, @@ -239,7 +239,7 @@ END_MSG_MAP() } virtual void GetProfilePath(const std::wstring& profile_name, - FilePath* profile_path) { + base::FilePath* profile_path) { return GetChromeFrameProfilePath(profile_name, profile_path); } diff --git a/chrome_frame/chrome_frame_reporting.cc b/chrome_frame/chrome_frame_reporting.cc index 4c210aa..f9fa490 100644 --- a/chrome_frame/chrome_frame_reporting.cc +++ b/chrome_frame/chrome_frame_reporting.cc @@ -21,8 +21,8 @@ const wchar_t kChromePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; google_breakpad::CustomClientInfo* GetCustomInfo(const wchar_t* dll_path) { std::wstring product; std::wstring version; - scoped_ptr<FileVersionInfo> - version_info(FileVersionInfo::CreateFileVersionInfo(FilePath(dll_path))); + scoped_ptr<FileVersionInfo> version_info( + FileVersionInfo::CreateFileVersionInfo(base::FilePath(dll_path))); if (version_info.get()) { version = version_info->product_version(); product = version_info->product_short_name(); @@ -60,7 +60,7 @@ bool InitializeCrashReporting() { ExceptionBarrierConfig::set_enabled(true); // Get the alternate dump directory. We use the temp path. - FilePath temp_directory; + base::FilePath temp_directory; if (!file_util::GetTempDir(&temp_directory) || temp_directory.empty()) { return false; } diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc index 61c96dc..0fa88a7 100644 --- a/chrome_frame/chrome_launcher_unittest.cc +++ b/chrome_frame/chrome_launcher_unittest.cc @@ -9,7 +9,7 @@ #include "testing/gtest/include/gtest/gtest.h" TEST(ChromeLauncher, IsValidCommandLine) { - CommandLine bad(FilePath(L"dummy.exe")); + CommandLine bad(base::FilePath(L"dummy.exe")); bad.AppendSwitch(switches::kNoFirstRun); // in whitelist bad.AppendSwitch("no-such-switch"); // does not exist bad.AppendSwitch(switches::kHomePage); // exists but not in whitelist @@ -17,7 +17,7 @@ TEST(ChromeLauncher, IsValidCommandLine) { EXPECT_FALSE(chrome_launcher::IsValidCommandLine( bad.GetCommandLineString().c_str())); - CommandLine good(FilePath(L"dummy.exe")); + CommandLine good(base::FilePath(L"dummy.exe")); good.AppendSwitch(switches::kNoFirstRun); // in whitelist good.AppendSwitch(switches::kDisableBackgroundMode); // in whitelist good.AppendSwitchASCII(switches::kUserDataDir, "foo"); // in whitelist @@ -25,11 +25,11 @@ TEST(ChromeLauncher, IsValidCommandLine) { EXPECT_TRUE(chrome_launcher::IsValidCommandLine( good.GetCommandLineString().c_str())); - CommandLine no_params(FilePath(L"dummy.exe")); + CommandLine no_params(base::FilePath(L"dummy.exe")); EXPECT_TRUE(chrome_launcher::IsValidCommandLine( no_params.GetCommandLineString().c_str())); - CommandLine empty(FilePath(L"")); + CommandLine empty(base::FilePath(L"")); EXPECT_TRUE(chrome_launcher::IsValidCommandLine( empty.GetCommandLineString().c_str())); } diff --git a/chrome_frame/chrome_launcher_utils.cc b/chrome_frame/chrome_launcher_utils.cc index 0465b7b..3fde2bf 100644 --- a/chrome_frame/chrome_launcher_utils.cc +++ b/chrome_frame/chrome_launcher_utils.cc @@ -29,10 +29,10 @@ bool CreateChromeLauncherCommandLine(scoped_ptr<CommandLine>* command_line) { bool success = false; // The launcher EXE will be in the same directory as the Chrome Frame DLL, // so create a full path to it based on this assumption. - FilePath module_path; + base::FilePath module_path; if (PathService::Get(base::FILE_MODULE, &module_path)) { - FilePath current_dir = module_path.DirName(); - FilePath chrome_launcher = current_dir.Append( + base::FilePath current_dir = module_path.DirName(); + base::FilePath chrome_launcher = current_dir.Append( chrome_launcher::kLauncherExeBaseName); if (file_util::PathExists(chrome_launcher)) { command_line->reset(new CommandLine(chrome_launcher)); @@ -89,8 +89,8 @@ bool CreateLaunchCommandLine(scoped_ptr<CommandLine>* command_line) { return CreateChromeLauncherCommandLine(command_line); } -FilePath GetChromeExecutablePath() { - FilePath cur_path; +base::FilePath GetChromeExecutablePath() { + base::FilePath cur_path; PathService::Get(base::DIR_MODULE, &cur_path); cur_path = cur_path.Append(chrome::kBrowserProcessExecutableName); diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 2611d69..8b25a05 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -121,7 +121,7 @@ class ChromeTabModule : public CAtlDllModuleT<ChromeTabModule> { } if (SUCCEEDED(hr)) { - FilePath app_path = + base::FilePath app_path = chrome_launcher::GetChromeExecutablePath().DirName(); hr = registrar->AddReplacement(L"CHROME_APPPATH", app_path.value().c_str()); @@ -146,7 +146,7 @@ class ChromeTabModule : public CAtlDllModuleT<ChromeTabModule> { // Add the directory of chrome_launcher.exe. This will be the same // as the directory for the current DLL. std::wstring module_dir; - FilePath module_path; + base::FilePath module_path; if (PathService::Get(base::FILE_MODULE, &module_path)) { module_dir = module_path.DirName().value(); } else { @@ -305,8 +305,8 @@ HRESULT SetupUserLevelHelper() { base::win::RemoveCommandFromAutoRun(HKEY_CURRENT_USER, kRunKeyName); // Build the chrome_frame_helper command line. - FilePath module_path; - FilePath helper_path; + base::FilePath module_path; + base::FilePath helper_path; if (PathService::Get(base::FILE_MODULE, &module_path)) { module_path = module_path.DirName(); helper_path = module_path.Append(kChromeFrameHelperExe); diff --git a/chrome_frame/crash_reporting/minidump_test.cc b/chrome_frame/crash_reporting/minidump_test.cc index 5f71c97..00edf11 100644 --- a/chrome_frame/crash_reporting/minidump_test.cc +++ b/chrome_frame/crash_reporting/minidump_test.cc @@ -282,7 +282,7 @@ class MinidumpTest: public testing::Test { base::win::ScopedHandle dump_file_mapping_; void* dump_file_view_; - FilePath dump_file_; + base::FilePath dump_file_; }; TEST_F(MinidumpTest, Version) { @@ -299,7 +299,7 @@ TEST_F(MinidumpTest, Version) { dbg_help_file, arraysize(dbg_help_file))); scoped_ptr<FileVersionInfo> file_info( - FileVersionInfo::CreateFileVersionInfo(FilePath(dbg_help_file))); + FileVersionInfo::CreateFileVersionInfo(base::FilePath(dbg_help_file))); ASSERT_TRUE(file_info != NULL); VLOG(1) << "DbgHelp.dll version: " << file_info->file_version(); diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc index f2333f4..2749806 100644 --- a/chrome_frame/delete_chrome_history.cc +++ b/chrome_frame/delete_chrome_history.cc @@ -43,7 +43,7 @@ void DeleteChromeHistory::OnAutomationServerLaunchFailed( } void DeleteChromeHistory::GetProfilePath(const std::wstring& profile_name, - FilePath* profile_path) { + base::FilePath* profile_path) { ChromeFramePlugin::GetProfilePath(kIexploreProfileName, profile_path); } diff --git a/chrome_frame/delete_chrome_history.h b/chrome_frame/delete_chrome_history.h index 810f35f..0b7ba8d 100644 --- a/chrome_frame/delete_chrome_history.h +++ b/chrome_frame/delete_chrome_history.h @@ -53,7 +53,7 @@ END_MSG_MAP() AutomationLaunchResult reason, const std::string& server_version); virtual void GetProfilePath(const std::wstring& profile_name, - FilePath* profile_path); + base::FilePath* profile_path); private: unsigned long remove_mask_; diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc index 2bba924..f5b6b4b 100644 --- a/chrome_frame/dll_redirector.cc +++ b/chrome_frame/dll_redirector.cc @@ -278,12 +278,12 @@ HMODULE DllRedirector::LoadVersionedModule(Version* version) { system_buffer[0] = 0; if (GetModuleFileName(this_module, system_buffer, arraysize(system_buffer)) != 0) { - FilePath module_path(system_buffer); + base::FilePath module_path(system_buffer); // For a module located in // Foo\XXXXXXXXX\<module>.dll, load // Foo\<version>\<module>.dll: - FilePath module_name = module_path.BaseName(); + base::FilePath module_name = module_path.BaseName(); module_path = module_path.DirName() .DirName() .Append(ASCIIToWide(version->GetString())) diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 13d42f4..a1d1bcd 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -100,7 +100,7 @@ SimpleResourceLoader::SimpleResourceLoader() // but that's okay since we'll exit with success when the first is tried). language_tags.push_back(L"en-US"); - FilePath locales_path; + base::FilePath locales_path; DetermineLocalesDirectory(&locales_path); if (!LoadLocalePack(language_tags, locales_path, &locale_dll_handle_, @@ -137,10 +137,11 @@ void SimpleResourceLoader::GetPreferredLanguages( } // static -void SimpleResourceLoader::DetermineLocalesDirectory(FilePath* locales_path) { +void SimpleResourceLoader::DetermineLocalesDirectory( + base::FilePath* locales_path) { DCHECK(locales_path); - FilePath module_path; + base::FilePath module_path; PathService::Get(base::DIR_MODULE, &module_path); *locales_path = module_path.Append(kLocalesDirName); @@ -171,7 +172,7 @@ bool SimpleResourceLoader::IsValidLanguageTag( // static bool SimpleResourceLoader::LoadLocalePack( const std::vector<std::wstring>& language_tags, - const FilePath& locales_path, + const base::FilePath& locales_path, HMODULE* dll_handle, ui::DataPack** data_pack, std::wstring* language) { @@ -200,8 +201,9 @@ bool SimpleResourceLoader::LoadLocalePack( // Attempt to load both the resource pack and the dll. We return success // only we load both. - FilePath resource_pack_path = locales_path.Append(*scan + pack_suffix); - FilePath dll_path = locales_path.Append(*scan + dll_suffix); + base::FilePath resource_pack_path = + locales_path.Append(*scan + pack_suffix); + base::FilePath dll_path = locales_path.Append(*scan + dll_suffix); if (file_util::PathExists(resource_pack_path) && file_util::PathExists(dll_path)) { diff --git a/chrome_frame/simple_resource_loader.h b/chrome_frame/simple_resource_loader.h index ceaf7f2..9c31887 100644 --- a/chrome_frame/simple_resource_loader.h +++ b/chrome_frame/simple_resource_loader.h @@ -43,7 +43,7 @@ class SimpleResourceLoader { static void GetPreferredLanguages(std::vector<std::wstring>* language_tags); // Populates |locales_path| with the path to the "Locales" directory. - static void DetermineLocalesDirectory(FilePath* locales_path); + static void DetermineLocalesDirectory(base::FilePath* locales_path); // Returns false if |language_tag| is malformed. static bool IsValidLanguageTag(const std::wstring& language_tag); @@ -60,7 +60,7 @@ class SimpleResourceLoader { // |dll_handle|, the data pack in |data_pack| and the locale language in // the |language| parameter. static bool LoadLocalePack(const std::vector<std::wstring>& language_tags, - const FilePath& locales_path, + const base::FilePath& locales_path, HMODULE* dll_handle, ui::DataPack** data_pack, std::wstring* language); diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index 06a5745..347a041 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -111,7 +111,7 @@ class CFACWithChrome : public testing::Test { virtual void SetUp() OVERRIDE; virtual void TearDown() OVERRIDE; - static FilePath profile_path_; + static base::FilePath profile_path_; MockCFDelegate cfd_; scoped_refptr<ChromeFrameAutomationClient> client_; scoped_refptr<ChromeFrameLaunchParams> launch_params_; @@ -119,7 +119,7 @@ class CFACWithChrome : public testing::Test { }; // static -FilePath CFACWithChrome::profile_path_; +base::FilePath CFACWithChrome::profile_path_; // static void CFACWithChrome::SetUpTestCase() { diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h index 1debab7..370b894 100644 --- a/chrome_frame/test/automation_client_mock.h +++ b/chrome_frame/test/automation_client_mock.h @@ -149,7 +149,7 @@ class CFACMockTest : public testing::Test { // the victim of all tests scoped_refptr<ChromeFrameAutomationClient> client_; - FilePath profile_path_; + base::FilePath profile_path_; int timeout_; void* id_; // Automation server id we are going to return int tab_handle_; // Tab handle. Any non-zero value is Ok. diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h index a26d3074..8399d53 100644 --- a/chrome_frame/test/chrome_frame_automation_mock.h +++ b/chrome_frame/test/chrome_frame_automation_mock.h @@ -41,7 +41,7 @@ class AutomationMockDelegate mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); - FilePath profile_path; + base::FilePath profile_path; GetChromeFrameProfilePath(profile_name, &profile_path); chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path.value()); @@ -76,7 +76,7 @@ class AutomationMockDelegate // Navigate the external to a 'file://' url for unit test files bool NavigateRelativeFile(const std::wstring& file) { - FilePath cf_source_path; + base::FilePath cf_source_path; PathService::Get(base::DIR_SOURCE_ROOT, &cf_source_path); std::wstring file_url(L"file://"); file_url.append(cf_source_path.Append( diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 11c97ea..ac6afe6 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -176,7 +176,7 @@ base::ProcessHandle LaunchExecutable(const std::wstring& executable, } } } else { - CommandLine cmdline((FilePath(path))); + CommandLine cmdline((base::FilePath(path))); cmdline.AppendArgNative(argument); if (!base::LaunchProcess(cmdline, base::LaunchOptions(), &process)) { LOG(ERROR) << "LaunchProcess failed: " << ::GetLastError(); @@ -186,8 +186,8 @@ base::ProcessHandle LaunchExecutable(const std::wstring& executable, } base::ProcessHandle LaunchChrome(const std::wstring& url, - const FilePath& user_data_dir) { - FilePath path; + const base::FilePath& user_data_dir) { + base::FilePath path; PathService::Get(base::DIR_MODULE, &path); path = path.AppendASCII(kChromeImageName); @@ -417,7 +417,7 @@ HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser) { std::wstring GetExeVersion(const std::wstring& exe_path) { scoped_ptr<FileVersionInfo> ie_version_info( - FileVersionInfo::CreateFileVersionInfo(FilePath(exe_path))); + FileVersionInfo::CreateFileVersionInfo(base::FilePath(exe_path))); return ie_version_info->product_version(); } @@ -451,8 +451,8 @@ IEVersion GetInstalledIEVersion() { return IE_UNSUPPORTED; } -FilePath GetProfilePathForIE() { - FilePath profile_path; +base::FilePath GetProfilePathForIE() { + base::FilePath profile_path; // Browsers without IDeleteBrowsingHistory in non-priv mode // have their profiles moved into "Temporary Internet Files". // The code below basically retrieves the version of IE and computes @@ -466,8 +466,8 @@ FilePath GetProfilePathForIE() { return profile_path; } -FilePath GetTestDataFolder() { - FilePath test_dir; +base::FilePath GetTestDataFolder() { + base::FilePath test_dir; PathService::Get(base::DIR_SOURCE_ROOT, &test_dir); test_dir = test_dir.Append(FILE_PATH_LITERAL("chrome_frame")) .Append(FILE_PATH_LITERAL("test")) @@ -475,8 +475,8 @@ FilePath GetTestDataFolder() { return test_dir; } -FilePath GetSeleniumTestFolder() { - FilePath test_dir; +base::FilePath GetSeleniumTestFolder() { + base::FilePath test_dir; PathService::Get(base::DIR_SOURCE_ROOT, &test_dir); test_dir = test_dir.Append(FILE_PATH_LITERAL("data")) .Append(FILE_PATH_LITERAL("selenium_core")); @@ -602,7 +602,7 @@ base::ProcessHandle StartCrashService() { return NULL; } - FilePath exe_dir; + base::FilePath exe_dir; if (!PathService::Get(base::DIR_EXE, &exe_dir)) { DCHECK(false); return NULL; @@ -612,7 +612,7 @@ base::ProcessHandle StartCrashService() { VLOG(1) << "Starting crash_service.exe so you know if a test crashes!"; - FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe"); + base::FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe"); if (!base::LaunchProcess(crash_service_path.value(), base::LaunchOptions(), &crash_service)) { LOG(ERROR) << "Couldn't start crash_service.exe"; @@ -670,7 +670,7 @@ ScopedChromeFrameRegistrar::RegistrationType GetTestBedType() { } void ClearIESessionHistory() { - FilePath session_history_path; + base::FilePath session_history_path; if (!PathService::Get(base::DIR_LOCAL_APP_DATA, &session_history_path)) return; diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc index 0f557b3..6dcdaf7 100644 --- a/chrome_frame/test/chrome_frame_ui_test_utils.cc +++ b/chrome_frame/test/chrome_frame_ui_test_utils.cc @@ -739,8 +739,8 @@ bool IsDesktopUnlocked() { return desk; } -FilePath GetIAccessible2ProxyStubPath() { - FilePath path; +base::FilePath GetIAccessible2ProxyStubPath() { + base::FilePath path; PathService::Get(chrome::DIR_APP, &path); return path.AppendASCII("IAccessible2Proxy.dll"); } diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.h b/chrome_frame/test/chrome_frame_ui_test_utils.h index 680195f..7f98a79 100644 --- a/chrome_frame/test/chrome_frame_ui_test_utils.h +++ b/chrome_frame/test/chrome_frame_ui_test_utils.h @@ -286,7 +286,7 @@ void DumpAccessibilityTreeForWindow(HWND hwnd); bool IsDesktopUnlocked(); // Returns the location of the IAccessible2 COM proxy stub DLL. -FilePath GetIAccessible2ProxyStubPath(); +base::FilePath GetIAccessible2ProxyStubPath(); } // namespace chrome_frame_test diff --git a/chrome_frame/test/delete_chrome_history_test.cc b/chrome_frame/test/delete_chrome_history_test.cc index a0fc92d..0c44799 100644 --- a/chrome_frame/test/delete_chrome_history_test.cc +++ b/chrome_frame/test/delete_chrome_history_test.cc @@ -97,9 +97,9 @@ const size_t kBlankPngFileLength = 95; // Looks up |element_name| in the Chrome form data DB and ensures that the // results match |matcher|. ACTION_P2(ExpectFormValuesForElementNameMatch, element_name, matcher) { - FilePath root_path; + base::FilePath root_path; GetChromeFrameProfilePath(kIexploreProfileName, &root_path); - FilePath profile_path( + base::FilePath profile_path( root_path.Append(L"Default").Append(chrome::kWebDataFilename)); WebDatabase web_database; diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 8588e12..7182559 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -38,7 +38,7 @@ class DllRedirectorLoadingTest : public testing::Test { // install to test upgrades. static void SetUpTestCase() { // First ensure that we can find the built Chrome Frame DLL. - FilePath build_chrome_frame_dll = GetChromeFrameBuildPath(); + base::FilePath build_chrome_frame_dll = GetChromeFrameBuildPath(); ASSERT_TRUE(file_util::PathExists(build_chrome_frame_dll)); // Then grab its version. @@ -53,7 +53,7 @@ class DllRedirectorLoadingTest : public testing::Test { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); // Make a versioned dir for the original chrome frame dll to run under. - FilePath original_version_dir( + base::FilePath original_version_dir( temp_dir_.path().AppendASCII(original_version_->GetString())); ASSERT_TRUE(file_util::CreateDirectory(original_version_dir)); @@ -66,7 +66,7 @@ class DllRedirectorLoadingTest : public testing::Test { ASSERT_TRUE(file_util::PathExists(original_chrome_frame_dll_)); // Temporary location for the new Chrome Frame DLL. - FilePath temporary_new_chrome_frame_dll( + base::FilePath temporary_new_chrome_frame_dll( temp_dir_.path().Append(build_chrome_frame_dll.BaseName())); // Generate the version-bumped Chrome Frame DLL to a temporary path. @@ -88,7 +88,7 @@ class DllRedirectorLoadingTest : public testing::Test { ASSERT_EQ(new_version_->CompareTo(*original_version_.get()), 1); // Now move the new Chrome Frame dll to its final resting place: - FilePath new_version_dir( + base::FilePath new_version_dir( temp_dir_.path().AppendASCII(new_version_->GetString())); ASSERT_TRUE(file_util::CreateDirectory(new_version_dir)); new_chrome_frame_dll_ = @@ -108,16 +108,16 @@ class DllRedirectorLoadingTest : public testing::Test { } protected: - static FilePath original_chrome_frame_dll_; - static FilePath new_chrome_frame_dll_; + static base::FilePath original_chrome_frame_dll_; + static base::FilePath new_chrome_frame_dll_; static scoped_ptr<Version> original_version_; static scoped_ptr<Version> new_version_; static base::ScopedTempDir temp_dir_; }; // class DllRedirectorLoadingTest -FilePath DllRedirectorLoadingTest::original_chrome_frame_dll_; -FilePath DllRedirectorLoadingTest::new_chrome_frame_dll_; +base::FilePath DllRedirectorLoadingTest::original_chrome_frame_dll_; +base::FilePath DllRedirectorLoadingTest::new_chrome_frame_dll_; scoped_ptr<Version> DllRedirectorLoadingTest::original_version_; scoped_ptr<Version> DllRedirectorLoadingTest::new_version_; base::ScopedTempDir DllRedirectorLoadingTest::temp_dir_; @@ -133,8 +133,8 @@ base::ScopedTempDir DllRedirectorLoadingTest::temp_dir_; TEST_F(DllRedirectorLoadingTest, MAYBE_TestDllRedirection) { struct TestData { - FilePath first_dll; - FilePath second_dll; + base::FilePath first_dll; + base::FilePath second_dll; Version* expected_beacon_version; } test_data[] = { { diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index f5e8030..66b0546 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -34,13 +34,13 @@ class HtmlUtilUnittest : public testing::Test { HtmlUtilUnittest() {} // Returns the test path given a test case. - virtual bool GetTestPath(const std::string& test_case, FilePath* path) { + virtual bool GetTestPath(const std::string& test_case, base::FilePath* path) { if (!path) { NOTREACHED(); return false; } - FilePath test_path; + base::FilePath test_path; if (!PathService::Get(base::DIR_SOURCE_ROOT, &test_path)) { NOTREACHED(); return false; @@ -61,7 +61,7 @@ class HtmlUtilUnittest : public testing::Test { return false; } - FilePath path; + base::FilePath path; if (!GetTestPath(test_case, &path)) { NOTREACHED(); return false; diff --git a/chrome_frame/test/mock_ie_event_sink_test.cc b/chrome_frame/test/mock_ie_event_sink_test.cc index 60aa195..737d97d 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.cc +++ b/chrome_frame/test/mock_ie_event_sink_test.cc @@ -187,7 +187,7 @@ MockIEEventSinkTest::MockIEEventSinkTest() } MockIEEventSinkTest::MockIEEventSinkTest(int port, const std::wstring& address, - const FilePath& root_dir) + const base::FilePath& root_dir) : server_mock_(port, address, root_dir) { loop_.set_snapshot_on_timeout(true); EXPECT_CALL(server_mock_, Get(_, StrCaseEq(L"/favicon.ico"), _)) @@ -224,7 +224,7 @@ void MockIEEventSinkTest::LaunchIENavigateAndLoop(const std::wstring& url, } } -FilePath MockIEEventSinkTest::GetTestFilePath( +base::FilePath MockIEEventSinkTest::GetTestFilePath( const std::wstring& relative_path) { return server_mock_.root_dir().Append(relative_path); } diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h index 8770775..fcc7f2e 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.h +++ b/chrome_frame/test/mock_ie_event_sink_test.h @@ -278,7 +278,7 @@ class MockIEEventSinkTest { public: MockIEEventSinkTest(); MockIEEventSinkTest(int port, const std::wstring& address, - const FilePath& root_dir); + const base::FilePath& root_dir); ~MockIEEventSinkTest() { // Detach manually here so that it occurs before |last_resort_close_ie_| @@ -301,7 +301,7 @@ class MockIEEventSinkTest { // Returns the absolute FilePath for the test file given. |relative_path| // should be relative to the test data directory. - FilePath GetTestFilePath(const std::wstring& relative_path); + base::FilePath GetTestFilePath(const std::wstring& relative_path); // Returns the url for an html page just containing some text. Iff |use_cf| // is true, the chrome_frame meta tag will be included too. diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index f6c287a..d85edfa 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -835,7 +835,7 @@ TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) { EXPECT_CALL(download_window_mock, OnLoad(false, _)); EXPECT_CALL(download_window_mock, OnQuit()).Times(testing::AtMost(1)); - FilePath temp_file_path; + base::FilePath temp_file_path; ASSERT_TRUE(file_util::CreateTemporaryFile(&temp_file_path)); file_util::DieFileDie(temp_file_path, false); diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 4640508..1f0f5df 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -487,7 +487,7 @@ void FakeExternalTab::Initialize() { TestTimeouts::Initialize(); // Load Chrome.dll as our resource dll. - FilePath dll; + base::FilePath dll; PathService::Get(base::DIR_MODULE, &dll); dll = dll.Append(chrome::kBrowserResourcesDll); HMODULE res_mod = ::LoadLibraryExW(dll.value().c_str(), @@ -504,7 +504,7 @@ void FakeExternalTab::Initialize() { cmd->AppendSwitch(switches::kDisableWebResources); cmd->AppendSwitch(switches::kSingleProcess); - FilePath local_state_path; + base::FilePath local_state_path; CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path)); scoped_refptr<base::SequencedTaskRunner> local_state_task_runner = JsonPrefStore::GetTaskRunnerForFile(local_state_path, @@ -527,7 +527,8 @@ void FakeExternalTab::Initialize() { } void FakeExternalTab::InitializePostThreadsCreated() { - FilePath profile_path(ProfileManager::GetDefaultProfileDir(user_data())); + base::FilePath profile_path( + ProfileManager::GetDefaultProfileDir(user_data())); Profile* profile = g_browser_process->profile_manager()->GetProfile(profile_path); } @@ -713,9 +714,9 @@ void CFUrlRequestUnittestRunner::TakeDownBrowser() { } void CFUrlRequestUnittestRunner::InitializeLogging() { - FilePath exe; + base::FilePath exe; PathService::Get(base::FILE_EXE, &exe); - FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); + base::FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); logging::InitLogging( log_filename.value().c_str(), logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, @@ -744,7 +745,7 @@ void CFUrlRequestUnittestRunner::StartInitializationTimeout() { void CFUrlRequestUnittestRunner::OnInitializationTimeout() { LOG(ERROR) << "Failed to start Chrome Frame in the host browser."; - FilePath snapshot; + base::FilePath snapshot; if (ui_test_utils::SaveScreenSnapshotToDesktop(&snapshot)) LOG(ERROR) << "Screen snapshot saved to " << snapshot.value(); @@ -784,7 +785,7 @@ int CFUrlRequestUnittestRunner::PreCreateThreads() { } bool CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback( - const CommandLine& command_line, const FilePath& current_directory) { + const CommandLine& command_line, const base::FilePath& current_directory) { std::string channel_id = command_line.GetSwitchValueASCII( switches::kAutomationClientChannelID); EXPECT_FALSE(channel_id.empty()); diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index 43ae7246..cb4337b 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -49,7 +49,7 @@ class FakeExternalTab { virtual void InitializePostThreadsCreated(); virtual void Shutdown(); - const FilePath& user_data() const { + const base::FilePath& user_data() const { return user_data_dir_; } @@ -57,8 +57,8 @@ class FakeExternalTab { private: scoped_ptr<FakeBrowserProcessImpl> browser_process_; - FilePath overridden_user_dir_; - FilePath user_data_dir_; + base::FilePath overridden_user_dir_; + base::FilePath user_data_dir_; scoped_ptr<content::NotificationService> notificaton_service_; DISALLOW_COPY_AND_ASSIGN(FakeExternalTab); @@ -147,8 +147,9 @@ class CFUrlRequestUnittestRunner void StartInitializationTimeout(); void OnInitializationTimeout(); - bool ProcessSingletonNotificationCallback(const CommandLine& command_line, - const FilePath& current_directory); + bool ProcessSingletonNotificationCallback( + const CommandLine& command_line, + const base::FilePath& current_directory); bool launch_browser_; bool prompt_after_setup_; @@ -156,7 +157,7 @@ class CFUrlRequestUnittestRunner scoped_ptr<ProcessSingleton> process_singleton_; base::CancelableClosure timeout_closure_; scoped_ptr<logging_win::FileLogger> file_logger_; - FilePath log_file_; + base::FilePath log_file_; scoped_ptr<chrome_frame_test::IEConfigurator> ie_configurator_; DISALLOW_COPY_AND_ASSIGN(CFUrlRequestUnittestRunner); diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc index 7b94536..496e943 100644 --- a/chrome_frame/test/net/test_automation_provider.cc +++ b/chrome_frame/test/net/test_automation_provider.cc @@ -113,7 +113,7 @@ std::string TestAutomationProvider::GetProtocolVersion() { // updated in one module but does in another, so better to use the // exact same version to avoid hard-to-debug problems in development // builds. - FilePath path; + base::FilePath path; PathService::Get(base::DIR_MODULE, &path); path = path.AppendASCII("npchrome_frame.dll"); diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 2ff086f..90d2fbd 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -303,7 +303,8 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase { // startup tests. Refactor into a common implementation. void RunStartupTest(const char* graph, const char* trace, const char* startup_url, bool test_cold, - int total_binaries, const FilePath binaries_to_evict[], + int total_binaries, + const base::FilePath binaries_to_evict[], bool important, bool ignore_cache_error) { const int kNumCycles = 20; @@ -348,12 +349,12 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase { perf_test::PrintResultList(graph, "", trace, times, "ms", important); } - FilePath dir_app_; - FilePath chrome_dll_; - FilePath chrome_exe_; - FilePath chrome_frame_dll_; - FilePath icu_dll_; - FilePath ffmpegsumo_dll_; + base::FilePath dir_app_; + base::FilePath chrome_dll_; + base::FilePath chrome_exe_; + base::FilePath chrome_frame_dll_; + base::FilePath icu_dll_; + base::FilePath ffmpegsumo_dll_; protected: // Individual startup tests should implement this function. @@ -473,7 +474,7 @@ class ChromeFrameStartupTestActiveXReference ChromeFrameStartupTest::SetUp(); - chrome_frame_dll_ = FilePath( + chrome_frame_dll_ = base::FilePath( chrome_frame_registrar_->GetReferenceChromeFrameDllPath()); DVLOG(1) << __FUNCTION__ << ": " << chrome_frame_dll_.value(); } @@ -947,7 +948,7 @@ class SilverlightCreationTest : public ChromeFrameStartupTest { // handling of invalid pe files and paths as input. TEST(ImagePreReader, PreReadImage) { - FilePath current_exe; + base::FilePath current_exe; ASSERT_TRUE(PathService::Get(base::FILE_EXE, ¤t_exe)); int64 file_size_64 = 0; @@ -971,7 +972,7 @@ TEST(ImagePreReader, PreReadImage) { } TEST(ImagePreReader, PartialPreReadImage) { - FilePath current_exe; + base::FilePath current_exe; ASSERT_TRUE(PathService::Get(base::FILE_EXE, ¤t_exe)); const wchar_t* module_path = current_exe.value().c_str(); @@ -990,7 +991,7 @@ TEST(ImagePreReader, PartialPreReadImage) { } TEST(ImagePreReader, PartialPreReadImageOnDisk) { - FilePath current_exe; + base::FilePath current_exe; ASSERT_TRUE(PathService::Get(base::FILE_EXE, ¤t_exe)); const wchar_t* module_path = current_exe.value().c_str(); @@ -1009,7 +1010,7 @@ TEST(ImagePreReader, PartialPreReadImageOnDisk) { } TEST(ImagePreReader, PartialPreReadImageInMemory) { - FilePath current_exe; + base::FilePath current_exe; ASSERT_TRUE(PathService::Get(base::FILE_EXE, ¤t_exe)); const wchar_t* module_path = current_exe.value().c_str(); @@ -1057,7 +1058,7 @@ TEST_F(ChromeFrameBinariesLoadTest, PerfWarm) { TEST_F(ChromeFrameStartupTestActiveX, PerfCold) { SetConfigInt(L"PreRead", 0); - FilePath binaries_to_evict[] = { + base::FilePath binaries_to_evict[] = { ffmpegsumo_dll_, chrome_exe_, chrome_dll_, chrome_frame_dll_ }; RunStartupTest("cold", "t", "about:blank", true /* cold */, @@ -1068,7 +1069,7 @@ TEST_F(ChromeFrameStartupTestActiveX, PerfCold) { TEST_F(ChromeFrameStartupTestActiveX, PerfColdPreRead) { SetConfigInt(L"PreRead", 1); - FilePath binaries_to_evict[] = { + base::FilePath binaries_to_evict[] = { ffmpegsumo_dll_, chrome_exe_, chrome_dll_, chrome_frame_dll_ }; RunStartupTest("cold_preread", "t", "about:blank", true /* cold */, @@ -1078,14 +1079,14 @@ TEST_F(ChromeFrameStartupTestActiveX, PerfColdPreRead) { } TEST_F(ChromeFrameBinariesLoadTest, PerfCold) { - FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; + base::FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; RunStartupTest("binary_load_cold", "t", "", true /* cold */, arraysize(binaries_to_evict), binaries_to_evict, false /* not important */, false); } TEST_F(ChromeFrameBinariesLoadTest, PerfColdPreRead) { - FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; + base::FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; pre_read_type_ = kPreReadFull; RunStartupTest("binary_load_cold_preread", "t", "", true /* cold */, arraysize(binaries_to_evict), binaries_to_evict, @@ -1093,7 +1094,7 @@ TEST_F(ChromeFrameBinariesLoadTest, PerfColdPreRead) { } TEST_F(ChromeFrameBinariesLoadTest, PerfColdPartialPreRead15) { - FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; + base::FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; pre_read_type_ = kPreReadPartial; percentage_to_preread_ = 15; RunStartupTest("binary_load_cold_partial_preread", "t", "", true /* cold */, @@ -1103,7 +1104,7 @@ TEST_F(ChromeFrameBinariesLoadTest, PerfColdPartialPreRead15) { TEST_F(ChromeFrameBinariesLoadTest, PerfColdPartialPreRead25) { - FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; + base::FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; pre_read_type_ = kPreReadPartial; percentage_to_preread_ = 25; RunStartupTest("binary_load_cold_partial_preread", "t", "", true /* cold */, @@ -1112,7 +1113,7 @@ TEST_F(ChromeFrameBinariesLoadTest, PerfColdPartialPreRead25) { } TEST_F(ChromeFrameBinariesLoadTest, PerfColdPartialPreRead40) { - FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; + base::FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_}; pre_read_type_ = kPreReadPartial; percentage_to_preread_ = 40; RunStartupTest("binary_load_cold_partial_preread", "t", "", true /* cold */, @@ -1131,7 +1132,7 @@ TEST_F(ChromeFrameStartupTestActiveX, PerfChromeFrameInitializationWarm) { } TEST_F(ChromeFrameStartupTestActiveX, PerfChromeFrameInitializationCold) { - FilePath binaries_to_evict[] = {chrome_frame_dll_}; + base::FilePath binaries_to_evict[] = {chrome_frame_dll_}; RunStartupTest("ChromeFrame_init_cold", "t", "", true /* cold */, arraysize(binaries_to_evict), binaries_to_evict, false /* not important */, false); @@ -1213,7 +1214,7 @@ TEST_F(SilverlightCreationTest, DISABLED_PerfWarm) { } TEST_F(ChromeFrameCreationTest, PerfCold) { - FilePath binaries_to_evict[] = {chrome_frame_dll_}; + base::FilePath binaries_to_evict[] = {chrome_frame_dll_}; RunStartupTest("creation_cold", "t", "", true /* cold */, arraysize(binaries_to_evict), binaries_to_evict, @@ -1231,8 +1232,8 @@ TEST_F(FlashCreationTest, PerfCold) { ASSERT_EQ(ERROR_SUCCESS, flash_key.ReadValue(L"", &plugin_path)); ASSERT_FALSE(plugin_path.empty()); - FilePath flash_path = FilePath(plugin_path); - FilePath binaries_to_evict[] = {flash_path}; + base::FilePath flash_path = base::FilePath(plugin_path); + base::FilePath binaries_to_evict[] = {flash_path}; RunStartupTest("creation_cold", "t_flash", "", true /* cold */, arraysize(binaries_to_evict), binaries_to_evict, @@ -1252,8 +1253,8 @@ TEST_F(SilverlightCreationTest, DISABLED_PerfCold) { ASSERT_EQ(ERROR_SUCCESS, silverlight_key.ReadValue(L"", &plugin_path)); ASSERT_FALSE(plugin_path.empty()); - FilePath silverlight_path = FilePath(plugin_path); - FilePath binaries_to_evict[] = {silverlight_path}; + base::FilePath silverlight_path = base::FilePath(plugin_path); + base::FilePath binaries_to_evict[] = {silverlight_path}; RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */, arraysize(binaries_to_evict), binaries_to_evict, @@ -1353,7 +1354,7 @@ class EtwPerfSession { consumer.Close(); } - FilePath etl_log_file_; + base::FilePath etl_log_file_; base::win::EtwTraceController controller_; }; @@ -1477,7 +1478,7 @@ void PrintResultList(const std::string& measurement, } bool RunSingleTestOutOfProc(const std::string& test_name) { - FilePath path; + base::FilePath path; if (!PathService::Get(base::DIR_EXE, &path)) return false; path = path.Append(L"chrome_frame_tests.exe"); diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index f888630..e13af50 100644 --- a/chrome_frame/test/policy_settings_unittest.cc +++ b/chrome_frame/test/policy_settings_unittest.cc @@ -236,7 +236,7 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { PolicySettings::GetInstance()->AdditionalLaunchParameters(); EXPECT_TRUE(additional_params.HasSwitch(switches::kDisableMediaSource)); - FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); + base::FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); CommandLine new_cmd_line(program_path); new_cmd_line.AppendArguments(additional_params, false); EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); diff --git a/chrome_frame/test/proxy_factory_mock.cc b/chrome_frame/test/proxy_factory_mock.cc index 9bb4f2e..f98a2e6 100644 --- a/chrome_frame/test/proxy_factory_mock.cc +++ b/chrome_frame/test/proxy_factory_mock.cc @@ -34,7 +34,7 @@ void ProxyFactoryTest::SetUp() { ChromeFrameLaunchParams* ProxyFactoryTest::MakeLaunchParams( const wchar_t* profile_name) { GURL empty; - FilePath profile_path; + base::FilePath profile_path; GetChromeFrameProfilePath(profile_name, &profile_path); chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path.value()); ChromeFrameLaunchParams* params = diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 3b85697..f3f4c9e5 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -86,7 +86,7 @@ const char kV8LogFileDefaultName[] = "v8.log"; // String name of local chrome dll for looking up file information. const wchar_t kChromeDll[] = L"chrome.dll"; -FilePath g_url_file_path; +base::FilePath g_url_file_path; int32 g_start_index = 1; int32 g_end_index = kint32max; int32 g_iterations = 1; @@ -94,11 +94,11 @@ bool g_memory_usage = false; bool g_page_down = true; bool g_clear_profile = true; std::string g_end_url; -FilePath g_log_file_path; +base::FilePath g_log_file_path; bool g_save_debug_log = false; -FilePath g_chrome_log_path; -FilePath g_v8_log_path; -FilePath g_test_log_path; +base::FilePath g_chrome_log_path; +base::FilePath g_v8_log_path; +base::FilePath g_test_log_path; bool g_stand_alone = false; const int kUrlNavigationTimeoutSeconds = 20; @@ -154,14 +154,14 @@ class PageLoadTest : public testing::Test { std::ofstream test_log; // Create a test log. - g_test_log_path = FilePath(FILE_PATH_LITERAL("test_log.log")); + g_test_log_path = base::FilePath(FILE_PATH_LITERAL("test_log.log")); test_log.open(g_test_log_path.value().c_str()); // Check file version info for chrome dll. scoped_ptr<FileVersionInfo> file_info; #if defined(OS_WIN) file_info.reset( - FileVersionInfo::CreateFileVersionInfo(FilePath(kChromeDll))); + FileVersionInfo::CreateFileVersionInfo(base::FilePath(kChromeDll))); #elif defined(OS_LINUX) || defined(OS_MACOSX) // TODO(fmeawad): the version retrieved here belongs to the test module and // not the chrome binary, need to be changed to chrome binary instead. @@ -335,14 +335,14 @@ class PageLoadTest : public testing::Test { file_util::FileEnumerator enumerator(crash_dumps_dir_path_, false, // not recursive file_util::FileEnumerator::FILES); - for (FilePath path = enumerator.Next(); !path.value().empty(); + for (base::FilePath path = enumerator.Next(); !path.value().empty(); path = enumerator.Next()) { if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp"))) crash_dumps_[path.BaseName()] = true; } if (g_clear_profile) { - FilePath user_data_dir; + base::FilePath user_data_dir; chrome::GetChromeFrameUserDataDirectory(&user_data_dir); ASSERT_TRUE(file_util::DieFileDie(user_data_dir, true)); } @@ -356,17 +356,17 @@ class PageLoadTest : public testing::Test { DeleteConfigValue(kAllowUnsafeURLs); } - FilePath ConstructSavedDebugLogPath(const FilePath& debug_log_path, - int index) { + base::FilePath ConstructSavedDebugLogPath(const base::FilePath& debug_log_path, + int index) { std::string suffix("_"); suffix.append(base::IntToString(index)); return debug_log_path.InsertBeforeExtensionASCII(suffix); } - void SaveDebugLog(const FilePath& log_path, const std::wstring& log_id, + void SaveDebugLog(const base::FilePath& log_path, const std::wstring& log_id, std::ofstream& log_file, int index) { if (!log_path.empty()) { - FilePath saved_log_file_path = + base::FilePath saved_log_file_path = ConstructSavedDebugLogPath(log_path, index); if (file_util::Move(log_path, saved_log_file_path)) { log_file << " " << log_id << "=" << saved_log_file_path.value(); @@ -387,10 +387,10 @@ class PageLoadTest : public testing::Test { // If a log_file is provided, log the crash dump with the given path; // otherwise, delete the crash dump file. void LogOrDeleteCrashDump(std::ofstream& log_file, - FilePath crash_dump_file_name) { - FilePath crash_dump_file_path(crash_dumps_dir_path_); + base::FilePath crash_dump_file_name) { + base::FilePath crash_dump_file_path(crash_dumps_dir_path_); crash_dump_file_path = crash_dump_file_path.Append(crash_dump_file_name); - FilePath crash_text_file_path = + base::FilePath crash_text_file_path = crash_dump_file_path.ReplaceExtension(FILE_PATH_LITERAL("txt")); if (log_file.is_open()) { @@ -414,7 +414,7 @@ class PageLoadTest : public testing::Test { file_util::FileEnumerator enumerator(crash_dumps_dir_path_, false, // not recursive file_util::FileEnumerator::FILES); - for (FilePath path = enumerator.Next(); !path.value().empty(); + for (base::FilePath path = enumerator.Next(); !path.value().empty(); path = enumerator.Next()) { if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp")) && !crash_dumps_[path.BaseName()]) { @@ -430,7 +430,7 @@ class PageLoadTest : public testing::Test { // that was saved by the app as it closed. The caller takes ownership of the // returned PrefService object. PrefService* GetLocalState(PrefRegistry* registry) { - FilePath path; + base::FilePath path; chrome::GetChromeFrameUserDataDirectory(&path); PrefServiceMockBuilder builder; builder.WithUserFilePrefs( @@ -471,8 +471,8 @@ class PageLoadTest : public testing::Test { metrics->browser_crash_count++; } - FilePath GetSampleDataDir() { - FilePath test_dir; + base::FilePath GetSampleDataDir() { + base::FilePath test_dir; PathService::Get(chrome::DIR_TEST_DATA, &test_dir); test_dir = test_dir.AppendASCII("reliability"); test_dir = test_dir.AppendASCII("sample_pages"); @@ -480,7 +480,7 @@ class PageLoadTest : public testing::Test { } // The pathname of Chrome's crash dumps directory. - FilePath crash_dumps_dir_path_; + base::FilePath crash_dumps_dir_path_; // The set of all the crash dumps we have seen. Each crash generates a // .dmp and a .txt file in the crash dumps directory. We only store the @@ -491,7 +491,7 @@ class PageLoadTest : public testing::Test { // in the set). The initial value for any key in std::map is 0 (false), // which in this case means a new file is not in the set initially, // exactly the semantics we want. - std::map<FilePath, bool> crash_dumps_; + std::map<base::FilePath, bool> crash_dumps_; }; TEST_F(PageLoadTest, IEFullTabMode_Reliability) { @@ -589,7 +589,7 @@ void SetPageRange(const CommandLine& parsed_command_line) { if (v8_command_line.HasSwitch(kV8LogFileSwitch)) { g_v8_log_path = v8_command_line.GetSwitchValuePath(kV8LogFileSwitch); if (!file_util::AbsolutePath(&g_v8_log_path)) - g_v8_log_path = FilePath(); + g_v8_log_path = base::FilePath(); } } } diff --git a/chrome_frame/test/simple_resource_loader_test.cc b/chrome_frame/test/simple_resource_loader_test.cc index bf881c0..d9f60cc8 100644 --- a/chrome_frame/test/simple_resource_loader_test.cc +++ b/chrome_frame/test/simple_resource_loader_test.cc @@ -11,8 +11,8 @@ TEST(SimpleResourceLoaderTest, LoadLocaleDll) { std::vector<std::wstring> language_tags; - FilePath locales_path; - FilePath file_path; + base::FilePath locales_path; + base::FilePath file_path; HMODULE dll_handle = NULL; SimpleResourceLoader::DetermineLocalesDirectory(&locales_path); diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc index 5c19b8e..a927d70 100644 --- a/chrome_frame/test/test_scrubber.cc +++ b/chrome_frame/test/test_scrubber.cc @@ -107,7 +107,7 @@ void TestScrubber::CleanUpFromTestRun() { ASCIIToWide(switches::kChromeFrame)); // Delete the user data directory. - FilePath data_directory(data_directory_override_.empty() ? + base::FilePath data_directory(data_directory_override_.empty() ? default_data_directory_ : data_directory_override_); diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index e580476..cca7fe3 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -251,7 +251,7 @@ void SimpleWebServer::DidClose(net::StreamListenSocket* sock) { } HTTPTestServer::HTTPTestServer(int port, const std::wstring& address, - FilePath root_dir) + base::FilePath root_dir) : port_(port), address_(address), root_dir_(root_dir) { net::EnsureWinsockInit(); server_ = diff --git a/chrome_frame/test/test_server.h b/chrome_frame/test/test_server.h index 04da126..48fd4b7 100644 --- a/chrome_frame/test/test_server.h +++ b/chrome_frame/test/test_server.h @@ -241,7 +241,7 @@ class SimpleResponse : public ResponseForPath { // contents of the file and performs registry lookups. class FileResponse : public ResponseForPath { public: - FileResponse(const char* request_path, const FilePath& file_path) + FileResponse(const char* request_path, const base::FilePath& file_path) : ResponseForPath(request_path), file_path_(file_path) { } @@ -250,7 +250,7 @@ class FileResponse : public ResponseForPath { virtual size_t ContentLength() const; protected: - FilePath file_path_; + base::FilePath file_path_; mutable scoped_ptr<file_util::MemoryMappedFile> file_; private: @@ -398,7 +398,8 @@ class ConfigurableConnection : public base::RefCounted<ConfigurableConnection> { // instance to send the response. class HTTPTestServer : public net::StreamListenSocket::Delegate { public: - HTTPTestServer(int port, const std::wstring& address, FilePath root_dir); + HTTPTestServer(int port, const std::wstring& address, + base::FilePath root_dir); virtual ~HTTPTestServer(); // HTTP GET request is received. Override in derived classes. @@ -414,12 +415,12 @@ class HTTPTestServer : public net::StreamListenSocket::Delegate { // Return the appropriate url with the specified path for this server. std::wstring Resolve(const std::wstring& path); - FilePath root_dir() { return root_dir_; } + base::FilePath root_dir() { return root_dir_; } protected: int port_; std::wstring address_; - FilePath root_dir_; + base::FilePath root_dir_; private: typedef std::list<scoped_refptr<ConfigurableConnection> > ConnectionList; diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index 54f96a6..a489a83 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -32,12 +32,12 @@ class TestServerTest: public testing::Test { } public: - const FilePath& source_path() const { + const base::FilePath& source_path() const { return source_path_; } protected: - FilePath source_path_; + base::FilePath source_path_; }; namespace { diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 277675a..5247426 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -53,7 +53,7 @@ std::string CreateHttpHeaders(CFInvocation invocation, return ss.str(); } -std::string GetMockHttpHeaders(const FilePath& mock_http_headers_path) { +std::string GetMockHttpHeaders(const base::FilePath& mock_http_headers_path) { std::string headers; file_util::ReadFileToString(mock_http_headers_path, &headers); return headers; @@ -72,12 +72,12 @@ class ChromeFrameTestEnvironment: public testing::Environment { } // namespace -FilePath ChromeFrameTestWithWebServer::test_file_path_; -FilePath ChromeFrameTestWithWebServer::results_dir_; -FilePath ChromeFrameTestWithWebServer::CFInstall_path_; -FilePath ChromeFrameTestWithWebServer::CFInstance_path_; +base::FilePath ChromeFrameTestWithWebServer::test_file_path_; +base::FilePath ChromeFrameTestWithWebServer::results_dir_; +base::FilePath ChromeFrameTestWithWebServer::CFInstall_path_; +base::FilePath ChromeFrameTestWithWebServer::CFInstance_path_; base::ScopedTempDir ChromeFrameTestWithWebServer::temp_dir_; -FilePath ChromeFrameTestWithWebServer::chrome_user_data_dir_; +base::FilePath ChromeFrameTestWithWebServer::chrome_user_data_dir_; chrome_frame_test::TimedMsgLoop* ChromeFrameTestWithWebServer::loop_; std::string ChromeFrameTestWithWebServer::local_address_; testing::StrictMock<MockWebServerListener>* @@ -89,7 +89,7 @@ ChromeFrameTestWithWebServer::ChromeFrameTestWithWebServer() { // static void ChromeFrameTestWithWebServer::SetUpTestCase() { - FilePath chrome_frame_source_path; + base::FilePath chrome_frame_source_path; PathService::Get(base::DIR_SOURCE_ROOT, &chrome_frame_source_path); chrome_frame_source_path = chrome_frame_source_path.Append( FILE_PATH_LITERAL("chrome_frame")); @@ -102,8 +102,8 @@ void ChromeFrameTestWithWebServer::SetUpTestCase() { // Copy the CFInstance.js and CFInstall.js files from src\chrome_frame to // src\chrome_frame\test\data. - FilePath CFInstance_src_path; - FilePath CFInstall_src_path; + base::FilePath CFInstance_src_path; + base::FilePath CFInstall_src_path; CFInstance_src_path = chrome_frame_source_path.AppendASCII("CFInstance.js"); CFInstance_path_ = test_file_path_.AppendASCII("CFInstance.js"); @@ -141,7 +141,8 @@ void ChromeFrameTestWithWebServer::TearDownTestCase() { } // static -const FilePath& ChromeFrameTestWithWebServer::GetChromeUserDataDirectory() { +const base::FilePath& +ChromeFrameTestWithWebServer::GetChromeUserDataDirectory() { if (!temp_dir_.IsValid()) { EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); chrome_user_data_dir_ = temp_dir_.path().AppendASCII("User Data"); @@ -179,7 +180,7 @@ bool ChromeFrameTestWithWebServer::LaunchBrowser(BrowserKind browser, if (browser == IE) { browser_handle_.Set(chrome_frame_test::LaunchIE(url)); } else if (browser == CHROME) { - const FilePath& user_data_dir = GetChromeUserDataDirectory(); + const base::FilePath& user_data_dir = GetChromeUserDataDirectory(); chrome_frame_test::OverrideDataDirectoryForThisTest(user_data_dir.value()); browser_handle_.Set(chrome_frame_test::LaunchChrome(url, user_data_dir)); } else { @@ -287,7 +288,7 @@ void ChromeFrameTestWithWebServer::ExpectAndHandlePostedResult() { void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser, const wchar_t* page) { - FilePath plugin_path; + base::FilePath plugin_path; PathService::Get(base::DIR_MODULE, &plugin_path); plugin_path = plugin_path.Append(kChromeFrameDllName); @@ -309,7 +310,7 @@ void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser, ASSERT_TRUE(ver_system.IsValid() || ver_user.IsValid()); bool system_install = ver_system.IsValid(); - FilePath cf_dll_path(installer::GetChromeInstallPath(system_install, dist)); + base::FilePath cf_dll_path(installer::GetChromeInstallPath(system_install, dist)); cf_dll_path = cf_dll_path.Append(UTF8ToWide( ver_system.IsValid() ? ver_system.GetString() : ver_user.GetString())); cf_dll_path = cf_dll_path.Append(kChromeFrameDllName); @@ -390,7 +391,7 @@ void MockWebServer::SendResponseHelper( if (query_index != std::string::npos) { path = path.erase(query_index); } - FilePath file_path = root_dir_; + base::FilePath file_path = root_dir_; if (path.size()) file_path = file_path.Append(path.substr(1)); // remove first '/' @@ -398,7 +399,7 @@ void MockWebServer::SendResponseHelper( std::string content_type; if (file_util::PathExists(file_path) && !file_util::DirectoryExists(file_path)) { - FilePath mock_http_headers(file_path.value() + L".mock-http-headers"); + base::FilePath mock_http_headers(file_path.value() + L".mock-http-headers"); if (file_util::PathExists(mock_http_headers)) { headers = GetMockHttpHeaders(mock_http_headers); content_type = http_utils::GetHttpHeaderFromHeaderList("Content-type", @@ -875,7 +876,8 @@ class UaTemplateFileResponse : public test_server::FileResponse { public: typedef test_server::FileResponse SuperClass; - UaTemplateFileResponse(const char* request_path, const FilePath& file_path) + UaTemplateFileResponse(const char* request_path, + const base::FilePath& file_path) : test_server::FileResponse(request_path, file_path), request_id_(0) { } diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index fe03b0f..e42eedf 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/chrome_frame/test/test_with_web_server.h @@ -78,7 +78,7 @@ class WebServerListener { // "<body>Rendered in CF.</body></html>", 4, 1000)); class MockWebServer : public test_server::HTTPTestServer { public: - MockWebServer(int port, const std::wstring& address, FilePath root_dir) + MockWebServer(int port, const std::wstring& address, base::FilePath root_dir) : test_server::HTTPTestServer(port, address, root_dir), listener_(NULL) {} // Overriden from test_server::HTTPTestServer. @@ -206,7 +206,7 @@ class ChromeFrameTestWithWebServer : public testing::Test { // Ensures (well, at least tries to ensure) that the browser window has focus. bool BringBrowserToTop(); - const FilePath& GetCFTestFilePath() { + const base::FilePath& GetCFTestFilePath() { return test_file_path_; } @@ -225,17 +225,17 @@ class ChromeFrameTestWithWebServer : public testing::Test { static void SetUpTestCase(); static void TearDownTestCase(); - static const FilePath& GetChromeUserDataDirectory(); + static const base::FilePath& GetChromeUserDataDirectory(); virtual void SetUp() OVERRIDE; virtual void TearDown() OVERRIDE; // The on-disk path to our html test files. - static FilePath test_file_path_; - static FilePath results_dir_; - static FilePath CFInstall_path_; - static FilePath CFInstance_path_; - static FilePath chrome_user_data_dir_; + static base::FilePath test_file_path_; + static base::FilePath results_dir_; + static base::FilePath CFInstall_path_; + static base::FilePath CFInstance_path_; + static base::FilePath chrome_user_data_dir_; // The user data directory used for Chrome instances. static base::ScopedTempDir temp_dir_; @@ -264,7 +264,7 @@ class SimpleWebServerTest { template <class ResponseClass> void PopulateStaticFileListT(const wchar_t* pages[], int count, - const FilePath& directory) { + const base::FilePath& directory) { for (int i = 0; i < count; ++i) { server_.AddResponse(new ResponseClass( base::StringPrintf("/%ls", pages[i]).c_str(), diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index bbcb4ca..65112af 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -471,7 +471,7 @@ class ContextMenuTest : public MockIEEventSinkTest, public testing::Test { .WillOnce(AccLeftClick(AccObjectMatcher(menu_item_name))); // Get safe download name using temporary file. - FilePath temp_file_path; + base::FilePath temp_file_path; ASSERT_TRUE(file_util::CreateTemporaryFile(&temp_file_path)); ASSERT_TRUE(file_util::DieFileDie(temp_file_path, false)); temp_file_path = temp_file_path.ReplaceExtension(file_ext); diff --git a/chrome_frame/test/urlmon_moniker_unittest.cc b/chrome_frame/test/urlmon_moniker_unittest.cc index 1e1126b..4480e43 100644 --- a/chrome_frame/test/urlmon_moniker_unittest.cc +++ b/chrome_frame/test/urlmon_moniker_unittest.cc @@ -31,7 +31,7 @@ class MonikerPatchTest : public testing::Test { bool ReadFileAsString(const wchar_t* file_name, std::string* file_contents) { EXPECT_TRUE(file_name); - FilePath file_path = test_file_path_.Append(file_name); + base::FilePath file_path = test_file_path_.Append(file_name); return file_util::ReadFileToString(file_path, file_contents); } @@ -60,7 +60,7 @@ class MonikerPatchTest : public testing::Test { return result; } - FilePath test_file_path_; + base::FilePath test_file_path_; ScopedVirtualizeHklmAndHkcu virtualized_registry_; }; diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index 9700144..f952dcf5 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.cc @@ -24,7 +24,7 @@ const wchar_t kSuffix[] = L"-fix"; // Registry override in the UtilsTest will cause shell APIs to fail // So separate this test from the rest TEST(SimpleUtilTests, GetTempInternetFiles) { - FilePath path = GetIETemporaryFilesFolder(); + base::FilePath path = GetIETemporaryFilesFolder(); EXPECT_FALSE(path.empty()); } @@ -51,7 +51,7 @@ TEST_F(UtilTests, GetModuleVersionTest) { // Use the method that goes to disk scoped_ptr<FileVersionInfo> base_info( - FileVersionInfo::CreateFileVersionInfo(FilePath(path))); + FileVersionInfo::CreateFileVersionInfo(base::FilePath(path))); EXPECT_TRUE(base_info.get() != NULL); // Use the method that doesn't go to disk diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index ef8a288..fd1ec78 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_); diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 7a9dc39..70abb32 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -353,7 +353,7 @@ const char kIEImageName[] = "iexplore.exe"; } // namespace std::wstring GetHostProcessName(bool include_extension) { - FilePath exe; + base::FilePath exe; if (PathService::Get(base::FILE_EXE, &exe)) exe = exe.BaseName(); if (!include_extension) { @@ -390,7 +390,7 @@ uint32 GetIEMajorVersion() { wchar_t exe_path[MAX_PATH]; HMODULE mod = GetModuleHandle(NULL); GetModuleFileName(mod, exe_path, arraysize(exe_path) - 1); - std::wstring exe_name = FilePath(exe_path).BaseName().value(); + std::wstring exe_name = base::FilePath(exe_path).BaseName().value(); if (!LowerCaseEqualsASCII(exe_name, kIEImageName)) { ie_major_version = 0; } else { @@ -437,7 +437,7 @@ IEVersion GetIEVersion() { return ie_version; } -FilePath GetIETemporaryFilesFolder() { +base::FilePath GetIETemporaryFilesFolder() { LPITEMIDLIST tif_pidl = NULL; HRESULT hr = SHGetFolderLocation(NULL, CSIDL_INTERNET_CACHE, NULL, SHGFP_TYPE_CURRENT, &tif_pidl); @@ -455,7 +455,8 @@ FilePath GetIETemporaryFilesFolder() { DCHECK(SUCCEEDED(hr)); base::win::ScopedBstr temp_internet_files_bstr; StrRetToBSTR(&path, relative_pidl, temp_internet_files_bstr.Receive()); - FilePath temp_internet_files(static_cast<BSTR>(temp_internet_files_bstr)); + base::FilePath temp_internet_files( + static_cast<BSTR>(temp_internet_files_bstr)); ILFree(tif_pidl); return temp_internet_files; } else { @@ -472,12 +473,12 @@ FilePath GetIETemporaryFilesFolder() { hr = SHGetFolderPath(NULL, CSIDL_INTERNET_CACHE, NULL, SHGFP_TYPE_CURRENT, path); if (SUCCEEDED(hr)) { - return FilePath(path); + return base::FilePath(path); } else { NOTREACHED() << "SHGetFolderPath for internet cache failed. Error:" << hr; } - return FilePath(); + return base::FilePath(); } bool IsIEInPrivate() { @@ -1673,7 +1674,7 @@ bool IncreaseWinInetConnections(DWORD connections) { } void GetChromeFrameProfilePath(const string16& profile_name, - FilePath* profile_path) { + base::FilePath* profile_path) { chrome::GetChromeFrameUserDataDirectory(profile_path); *profile_path = profile_path->Append(profile_name); DVLOG(1) << __FUNCTION__ << ": " << profile_path->value(); diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index 1f5de48..ea24cd7 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -47,7 +47,7 @@ using std::string; struct SimulationSpecification { string simulation_name; - FilePath input_path; + base::FilePath input_path; RenderModel model_under_test; TimeTicks simulation_start_time; int frames_rendered; @@ -60,7 +60,7 @@ void _update_loop(Simulator* sim); class Simulator { public: - Simulator(int seconds_per_test, const FilePath& output_path) + Simulator(int seconds_per_test, const base::FilePath& output_path) : current_sim_(NULL), output_path_(output_path), seconds_per_test_(seconds_per_test), @@ -82,7 +82,7 @@ class Simulator { XCloseDisplay(display_); } - void QueueTest(const FilePath& path) { + void QueueTest(const base::FilePath& path) { SimulationSpecification spec; // To get a std::string, we'll try to get an ASCII simulation name. @@ -225,7 +225,7 @@ class Simulator { SimulationSpecification& spec = sims_remaining_.front(); LOG(INFO) << "Initializing test for " << spec.simulation_name << "(" << ModelToString(spec.model_under_test) << ")"; - const FilePath& path = spec.input_path; + const base::FilePath& path = spec.input_path; RenderNode* root = NULL; if (!(root = BuildRenderTreeFromFile(path))) { @@ -343,7 +343,7 @@ class Simulator { RenderModelSimulator* current_sim_; queue<SimulationSpecification> sims_remaining_; queue<SimulationSpecification> sims_completed_; - FilePath output_path_; + base::FilePath output_path_; // Amount of time to run each simulation int seconds_per_test_; // GUI data @@ -380,7 +380,7 @@ int main(int argc, char* argv[]) { } Simulator sim(seconds_per_test, cl->GetSwitchValuePath("out")); - FilePath inPath = cl->GetSwitchValuePath("in"); + base::FilePath inPath = cl->GetSwitchValuePath("in"); if (!PathExists(inPath)) { LOG(FATAL) << "Path does not exist: " << inPath.LossyDisplayName(); @@ -390,7 +390,7 @@ int main(int argc, char* argv[]) { if (DirectoryExists(inPath)) { LOG(INFO) << "(input path is a directory)"; FileEnumerator dirItr(inPath, true, FileEnumerator::FILES); - for (FilePath f = dirItr.Next(); !f.empty(); f = dirItr.Next()) { + for (base::FilePath f = dirItr.Next(); !f.empty(); f = dirItr.Next()) { sim.QueueTest(f); } } else { diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc index c8e928a..bd2b99a 100644 --- a/gpu/tools/compositor_model_bench/render_tree.cc +++ b/gpu/tools/compositor_model_bench/render_tree.cc @@ -451,7 +451,7 @@ RenderNode* InterpretNode(DictionaryValue* node) { return NULL; } -RenderNode* BuildRenderTreeFromFile(const FilePath& path) { +RenderNode* BuildRenderTreeFromFile(const base::FilePath& path) { LOG(INFO) << "Reading " << path.LossyDisplayName(); string contents; if (!ReadFileToString(path, &contents)) diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 0906152..615704a 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -170,8 +170,8 @@ bool CreateServerUnixDomainSocket(const std::string& pipe_name, unlink(pipe_name.c_str()); // Make sure the path we need exists. - FilePath path(pipe_name); - FilePath dir_path = path.DirName(); + base::FilePath path(pipe_name); + base::FilePath dir_path = path.DirName(); if (!file_util::CreateDirectory(dir_path)) { if (HANDLE_EINTR(close(fd)) < 0) PLOG(ERROR) << "close " << pipe_name; @@ -738,7 +738,7 @@ void Channel::ChannelImpl::ResetToAcceptingConnectionState() { // static bool Channel::ChannelImpl::IsNamedServerInitialized( const std::string& channel_id) { - return file_util::PathExists(FilePath(channel_id)); + return file_util::PathExists(base::FilePath(channel_id)); } #if defined(OS_LINUX) diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index 56549f1..cdf54da 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -110,7 +110,7 @@ private: const std::string IPCChannelPosixTest::GetChannelDirName() { #if defined(OS_ANDROID) - FilePath tmp_dir; + base::FilePath tmp_dir; PathService::Get(base::DIR_CACHE, &tmp_dir); return tmp_dir.value(); #else @@ -155,8 +155,8 @@ void IPCChannelPosixTest::SetUpSocket(IPC::ChannelHandle *handle, // Only one server at a time. Cleanup garbage if it exists. unlink(name.c_str()); // Make sure the path we need exists. - FilePath path(name); - FilePath dir_path = path.DirName(); + base::FilePath path(name); + base::FilePath dir_path = path.DirName(); ASSERT_TRUE(file_util::CreateDirectory(dir_path)); ASSERT_GE(bind(socket_fd, reinterpret_cast<struct sockaddr *>(&server_address), @@ -377,7 +377,7 @@ TEST_F(IPCChannelPosixTest, IsNamedServerInitialized) { const std::string& connection_socket_name = GetConnectionSocketName(); IPCChannelPosixTestListener listener(false); IPC::ChannelHandle chan_handle(connection_socket_name); - ASSERT_TRUE(file_util::Delete(FilePath(connection_socket_name), false)); + ASSERT_TRUE(file_util::Delete(base::FilePath(connection_socket_name), false)); ASSERT_FALSE(IPC::Channel::IsNamedServerInitialized( connection_socket_name)); IPC::Channel channel(chan_handle, IPC::Channel::MODE_NAMED_SERVER, &listener); diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index a4beb0e..c2191ce 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -488,18 +488,18 @@ void ParamTraits<base::FileDescriptor>::Log(const param_type& p, } #endif // defined(OS_POSIX) -void ParamTraits<FilePath>::Write(Message* m, const param_type& p) { +void ParamTraits<base::FilePath>::Write(Message* m, const param_type& p) { p.WriteToPickle(m); } -bool ParamTraits<FilePath>::Read(const Message* m, - PickleIterator* iter, - param_type* r) { +bool ParamTraits<base::FilePath>::Read(const Message* m, + PickleIterator* iter, + param_type* r) { return r->ReadFromPickle(iter); } -void ParamTraits<FilePath>::Log(const param_type& p, std::string* l) { - ParamTraits<FilePath::StringType>::Log(p.value(), l); +void ParamTraits<base::FilePath>::Log(const param_type& p, std::string* l) { + ParamTraits<base::FilePath::StringType>::Log(p.value(), l); } void ParamTraits<ListValue>::Write(Message* m, const param_type& p) { diff --git a/ipc/ipc_message_utils_unittest.cc b/ipc/ipc_message_utils_unittest.cc index f9cb553..47e4a60 100644 --- a/ipc/ipc_message_utils_unittest.cc +++ b/ipc/ipc_message_utils_unittest.cc @@ -55,19 +55,19 @@ TEST(IPCMessageUtilsTest, NestedMessages) { // Tests that detection of various bad parameters is working correctly. TEST(IPCMessageUtilsTest, ParameterValidation) { - FilePath::StringType ok_string(FILE_PATH_LITERAL("hello"), 5); - FilePath::StringType bad_string(FILE_PATH_LITERAL("hel\0o"), 5); + base::FilePath::StringType ok_string(FILE_PATH_LITERAL("hello"), 5); + base::FilePath::StringType bad_string(FILE_PATH_LITERAL("hel\0o"), 5); // Change this if ParamTraits<FilePath>::Write() changes. IPC::Message message; - ParamTraits<FilePath::StringType>::Write(&message, ok_string); - ParamTraits<FilePath::StringType>::Write(&message, bad_string); + ParamTraits<base::FilePath::StringType>::Write(&message, ok_string); + ParamTraits<base::FilePath::StringType>::Write(&message, bad_string); PickleIterator iter(message); - FilePath ok_path; - FilePath bad_path; - ASSERT_TRUE(ParamTraits<FilePath>::Read(&message, &iter, &ok_path)); - ASSERT_FALSE(ParamTraits<FilePath>::Read(&message, &iter, &bad_path)); + base::FilePath ok_path; + base::FilePath bad_path; + ASSERT_TRUE(ParamTraits<base::FilePath>::Read(&message, &iter, &ok_path)); + ASSERT_FALSE(ParamTraits<base::FilePath>::Read(&message, &iter, &bad_path)); } } // namespace |