Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into file_path_browser

version control markers

Merge branch 'master' into file_path_browser

remove version control

Fix typo

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/intents/native_services_browsertest.cc
	chrome/browser/ui/intents/native_file_picker_service.cc

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/chromeos/drive/drive_file_system.cc
	chrome/browser/chromeos/drive/drive_file_system.h
	chrome/browser/chromeos/drive/drive_file_system_interface.h
	chrome/browser/chromeos/drive/drive_file_system_unittest.cc
	chrome/browser/chromeos/drive/file_system/drive_operations.cc
	chrome/browser/chromeos/login/wallpaper_manager.cc
	chrome/browser/chromeos/login/wallpaper_manager.h
	chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
	chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
	chrome/browser/google_apis/gdata_wapi_operations.cc
	chrome/browser/google_apis/gdata_wapi_operations.h
	chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
	chrome/browser/profiles/off_the_record_profile_impl.cc
	chrome/browser/profiles/off_the_record_profile_impl.h
	chrome/browser/profiles/profile_impl.cc
	chrome/browser/profiles/profile_impl.h
	chrome/browser/profiles/profile_impl_io_data.cc
	chrome/browser/profiles/profile_impl_io_data.h
	chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
	chrome/browser/ui/webui/options/manage_profile_handler.cc

Long lines

long lines

some long lines.

long lines

long lines

Beginning of lines.

Rename FilePath -> base::FilePath in chrome/browser

git-svn-id: http://src.chromium.org/svn/trunk/src/chrome/browser@181638 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
  • Loading branch information...
commit 990ded459687718c3447ca8d0797cd4da0f1e7a5 1 parent c19b10b
brettw@chromium.org authored
Showing with 2,775 additions and 2,604 deletions.
  1. +5 −5 android/crash_dump_manager.cc
  2. +2 −2 android/crash_dump_manager.h
  3. +2 −2 android/dev_tools_server.cc
  4. +7 −6 app_controller_mac.mm
  5. +3 −2 autofill/autofill_browsertest.cc
  6. +2 −2 autofill/autofill_merge_unittest.cc
  7. +13 −13 autofill/data_driven_test.cc
  8. +7 −6 autofill/data_driven_test.h
  9. +39 −20 autofill/form_structure_browsertest.cc
  10. +1 −1  automation/automation_provider_observers.cc
  11. +2 −2 automation/automation_provider_observers.h
  12. +1 −1  automation/automation_tab_helper_browsertest.cc
  13. +18 −18 automation/testing_automation_provider.cc
  14. +2 −2 background/background_application_list_model_unittest.cc
  15. +5 −5 background/background_mode_manager.cc
  16. +7 −5 background/background_mode_manager.h
  17. +2 −2 bookmarks/bookmark_codec_unittest.cc
  18. +4 −4 bookmarks/bookmark_html_writer.cc
  19. +3 −3 bookmarks/bookmark_html_writer.h
  20. +1 −1  bookmarks/bookmark_html_writer_unittest.cc
  21. +3 −3 bookmarks/bookmark_node_data.cc
  22. +1 −1  bookmarks/bookmark_node_data.h
  23. +3 −3 bookmarks/bookmark_pasteboard_helper_mac.mm
  24. +4 −4 bookmarks/bookmark_storage.cc
  25. +23 −16 browser_encoding_browsertest.cc
  26. +3 −3 browser_process_impl.cc
  27. +4 −4 browser_shutdown.cc
  28. +1 −1  browser_util_win.cc
  29. +2 −1  browsing_data/browsing_data_database_helper.cc
  30. +3 −2 browsing_data/browsing_data_database_helper_browsertest.cc
  31. +3 −2 browsing_data/browsing_data_file_system_helper_unittest.cc
  32. +10 −10 browsing_data/browsing_data_local_storage_helper_browsertest.cc
  33. +5 −5 browsing_data/browsing_data_remover_browsertest.cc
  34. +6 −5 browsing_data/browsing_data_remover_unittest.cc
  35. +22 −22 captive_portal/captive_portal_browsertest.cc
  36. +18 −16 chrome_browser_main.cc
  37. +1 −1  chrome_browser_main.h
  38. +1 −1  chrome_browser_main_android.cc
  39. +1 −1  chrome_browser_main_linux.cc
  40. +1 −1  chrome_browser_main_mac.mm
  41. +6 −6 chrome_browser_main_win.cc
  42. +9 −9 chrome_content_browser_client.cc
  43. +2 −2 chrome_content_browser_client.h
  44. +6 −6 chrome_main_browsertest.cc
  45. +5 −5 chrome_plugin_browsertest.cc
  46. +9 −8 chrome_to_mobile_service.cc
  47. +7 −7 chrome_to_mobile_service.h
  48. +1 −1  chromeos/accessibility/accessibility_util.cc
  49. +35 −31 chromeos/boot_times_loader.cc
  50. +2 −2 chromeos/camera_detector.cc
  51. +1 −1  chromeos/chrome_browser_main_chromeos.cc
  52. +2 −2 chromeos/contacts/contact_database.cc
  53. +4 −3 chromeos/contacts/contact_database.h
  54. +3 −3 chromeos/contacts/contact_database_unittest.cc
  55. +1 −1  chromeos/contacts/fake_contact_database.cc
  56. +1 −1  chromeos/contacts/fake_contact_database.h
  57. +2 −2 chromeos/contacts/google_contact_store.cc
  58. +10 −10 chromeos/cros/burn_library.cc
  59. +3 −3 chromeos/cros/burn_library.h
  60. +5 −4 chromeos/customization_document.cc
  61. +77 −70 chromeos/drive/drive_cache.cc
  62. +18 −16 chromeos/drive/drive_cache.h
  63. +17 −15 chromeos/drive/drive_cache_metadata.cc
  64. +2 −2 chromeos/drive/drive_cache_metadata.h
  65. +16 −14 chromeos/drive/drive_cache_metadata_unittest.cc
  66. +41 −41 chromeos/drive/drive_cache_unittest.cc
  67. +20 −18 chromeos/drive/drive_download_handler.cc
  68. +7 −7 chromeos/drive/drive_download_handler.h
  69. +8 −7 chromeos/drive/drive_feed_loader.cc
  70. +18 −17 chromeos/drive/drive_feed_processor.cc
  71. +14 −14 chromeos/drive/drive_feed_processor.h
  72. +73 −71 chromeos/drive/drive_file_system.cc
  73. +49 −49 chromeos/drive/drive_file_system.h
  74. +23 −23 chromeos/drive/drive_file_system_interface.h
  75. +33 −33 chromeos/drive/drive_file_system_proxy.cc
  76. +12 −12 chromeos/drive/drive_file_system_proxy.h
  77. +223 −207 chromeos/drive/drive_file_system_unittest.cc
  78. +24 −23 chromeos/drive/drive_file_system_util.cc
  79. +23 −23 chromeos/drive/drive_file_system_util_unittest.cc
  80. +8 −7 chromeos/drive/drive_files.cc
  81. +12 −10 chromeos/drive/drive_files.h
  82. +5 −5 chromeos/drive/drive_prefetcher.cc
  83. +6 −6 chromeos/drive/drive_prefetcher_unittest.cc
  84. +9 −9 chromeos/drive/drive_protocol_handler.cc
  85. +26 −26 chromeos/drive/drive_resource_metadata.cc
  86. +29 −28 chromeos/drive/drive_resource_metadata.h
  87. +97 −87 chromeos/drive/drive_resource_metadata_unittest.cc
  88. +7 −7 chromeos/drive/drive_scheduler.cc
  89. +12 −12 chromeos/drive/drive_scheduler.h
  90. +4 −4 chromeos/drive/drive_scheduler_unittest.cc
  91. +2 −2 chromeos/drive/drive_sync_client.cc
  92. +2 −2 chromeos/drive/drive_sync_client.h
  93. +4 −4 chromeos/drive/drive_sync_client_unittest.cc
  94. +3 −3 chromeos/drive/drive_system_service.cc
  95. +1 −1  chromeos/drive/drive_system_service_unittest.cc
  96. +2 −2 chromeos/drive/drive_task_executor.cc
  97. +13 −12 chromeos/drive/drive_test_util.cc
  98. +4 −4 chromeos/drive/drive_webapps_registry.cc
  99. +7 −7 chromeos/drive/drive_webapps_registry_unittest.cc
  100. +3 −2 chromeos/drive/file_change.cc
  101. +4 −4 chromeos/drive/file_change.h
  102. +13 −13 chromeos/drive/file_change_unittest.cc
  103. +36 −35 chromeos/drive/file_system/copy_operation.cc
  104. +12 −12 chromeos/drive/file_system/drive_operations.cc
  105. +28 −28 chromeos/drive/file_system/move_operation.cc
  106. +2 −2 chromeos/drive/file_system/remove_operation.cc
  107. +6 −6 chromeos/drive/file_system/update_operation.cc
  108. +8 −8 chromeos/drive/file_write_helper.cc
  109. +12 −12 chromeos/drive/file_write_helper_unittest.cc
  110. +1 −1  chromeos/drive/mock_directory_change_observer.h
  111. +19 −19 chromeos/drive/mock_drive_file_system.h
  112. +4 −4 chromeos/drive/search_metadata.cc
  113. +2 −2 chromeos/drive/search_metadata.h
  114. +10 −13 chromeos/drive/search_metadata_unittest.cc
  115. +1 −1  chromeos/drive/stale_cache_files_remover.cc
  116. +1 −1  chromeos/drive/stale_cache_files_remover.h
  117. +3 −3 chromeos/drive/stale_cache_files_remover_unittest.cc
  118. +1 −1  chromeos/enterprise_extension_observer.cc
  119. +2 −2 chromeos/extensions/default_app_order.cc
  120. +4 −4 chromeos/extensions/default_app_order_unittest.cc
  121. +1 −1  chromeos/extensions/echo_private_api.cc
  122. +8 −7 chromeos/extensions/external_filesystem_apitest.cc
  123. +16 −16 chromeos/extensions/file_browser_event_router.cc
  124. +13 −12 chromeos/extensions/file_browser_event_router.h
  125. +17 −17 chromeos/extensions/file_browser_handler_api.cc
  126. +5 −5 chromeos/extensions/file_browser_handler_api.h
  127. +25 −24 chromeos/extensions/file_browser_handler_api_test.cc
  128. +69 −66 chromeos/extensions/file_browser_private_api.cc
  129. +17 −17 chromeos/extensions/file_browser_private_api.h
  130. +1 −1  chromeos/extensions/file_browser_resource_throttle_browsertest.cc
  131. +10 −10 chromeos/extensions/file_handler_util.cc
  132. +2 −2 chromeos/extensions/file_handler_util.h
  133. +25 −25 chromeos/extensions/file_manager_util.cc
  134. +10 −10 chromeos/extensions/file_manager_util.h
  135. +5 −5 chromeos/extensions/install_limiter.cc
  136. +6 −5 chromeos/extensions/install_limiter.h
  137. +11 −11 chromeos/extensions/wallpaper_private_api.cc
  138. +3 −3 chromeos/extensions/zip_file_creator.cc
  139. +6 −6 chromeos/extensions/zip_file_creator.h
  140. +1 −1  chromeos/external_metrics.h
  141. +1 −1  chromeos/external_metrics_unittest.cc
  142. +5 −5 chromeos/imageburner/burn_controller.cc
  143. +4 −3 chromeos/imageburner/burn_manager.cc
  144. +9 −9 chromeos/imageburner/burn_manager.h
  145. +2 −2 chromeos/input_method/ibus_controller_impl.cc
  146. +2 −2 chromeos/input_method/textinput_browsertest.cc
  147. +15 −15 chromeos/kiosk_mode/kiosk_mode_screensaver.cc
  148. +3 −3 chromeos/kiosk_mode/kiosk_mode_screensaver.h
  149. +2 −2 chromeos/kiosk_mode/kiosk_mode_settings.cc
  150. +2 −2 chromeos/login/login_utils.cc
  151. +1 −1  chromeos/login/mock_user_image_manager.h
  152. +2 −2 chromeos/login/parallel_authenticator_unittest.cc
  153. +1 −1  chromeos/login/update_screen.cc
  154. +1 −1  chromeos/login/user_image_loader.cc
  155. +19 −16 chromeos/login/user_image_manager_browsertest.cc
  156. +7 −7 chromeos/login/user_image_manager_impl.cc
  157. +37 −37 chromeos/login/wallpaper_manager.cc
  158. +11 −10 chromeos/login/wallpaper_manager.h
  159. +13 −10 chromeos/login/wallpaper_manager_browsertest.cc
  160. +5 −5 chromeos/login/wizard_controller.cc
  161. +2 −2 chromeos/mobile/mobile_activator.cc
  162. +1 −1  chromeos/mobile/mobile_activator.h
  163. +5 −4 chromeos/mobile_config.cc
  164. +2 −1  chromeos/process_proxy/process_proxy.cc
  165. +1 −1  chromeos/screensaver/screensaver_controller_browsertest.cc
  166. +1 −1  chromeos/settings/device_settings_provider_unittest.cc
  167. +2 −2 chromeos/settings/owner_key_util.cc
  168. +1 −1  chromeos/settings/owner_key_util_unittest.cc
  169. +1 −1  chromeos/system/ash_system_tray_delegate.cc
  170. +2 −2 chromeos/system/drm_settings.cc
  171. +1 −1  chromeos/system/input_device_settings.cc
  172. +5 −4 chromeos/system/name_value_pairs_parser.cc
  173. +1 −1  chromeos/system/power_manager_settings.cc
  174. +4 −4 chromeos/system/statistics_provider.cc
  175. +5 −5 chromeos/system/syslogs_provider.cc
  176. +3 −3 chromeos/system/timezone_settings.cc
  177. +9 −8 chromeos/system_logs/command_line_log_source.cc
  178. +1 −1  chromeos/system_logs/debug_daemon_log_source.cc
  179. +1 −1  chromeos/system_logs/lsb_release_log_source.cc
  180. +2 −2 chromeos/version_loader.cc
  181. +2 −1  collected_cookies_browsertest.cc
  182. +4 −3 component_updater/component_unpacker.cc
  183. +2 −2 component_updater/component_unpacker.h
  184. +3 −3 component_updater/component_updater_service.cc
  185. +14 −14 component_updater/pepper_flash_component_installer.cc
  186. +16 −15 component_updater/pnacl/pnacl_component_installer.cc
  187. +4 −4 component_updater/recovery_component_installer.cc
  188. +17 −17 component_updater/swiftshader_component_installer.cc
  189. +2 −2 component_updater/test/component_installers_unittest.cc
  190. +3 −3 component_updater/test/component_updater_service_unittest.cc
  191. +12 −10 content_settings/content_settings_browsertest.cc
  192. +1 −1  crash_handler_host_linux.cc
  193. +6 −4 crash_recovery_browsertest.cc
  194. +2 −2 crash_upload_list.cc
  195. +3 −3 devtools/browser_list_tabcontents_provider.cc
  196. +1 −1  devtools/browser_list_tabcontents_provider.h
  197. +30 −28 devtools/devtools_file_helper.cc
  198. +3 −3 devtools/devtools_sanity_browsertest.cc
  199. +2 −1  diagnostics/diagnostics_model.cc
  200. +3 −3 diagnostics/diagnostics_test.cc
  201. +10 −8 diagnostics/recon_diagnostics.cc
  202. +15 −13 diagnostics/sqlite_diagnostics.cc
  203. +34 −33 download/chrome_download_manager_delegate.cc
  204. +16 −15 download/chrome_download_manager_delegate.h
  205. +33 −31 download/chrome_download_manager_delegate_unittest.cc
  206. +64 −59 download/download_browsertest.cc
  207. +1 −1  download/download_danger_prompt_browsertest.cc
  208. +3 −3 download/download_extensions.cc
  209. +1 −1  download/download_extensions.h
  210. +1 −1  download/download_file_icon_extractor.h
  211. +11 −10 download/download_file_picker.cc
  212. +8 −7 download/download_file_picker_chromeos.cc
  213. +2 −2 download/download_file_picker_chromeos.h
  214. +10 −10 download/download_history_unittest.cc
  215. +4 −4 download/download_item_model_unittest.cc
  216. +15 −15 download/download_path_reservation_tracker.cc
  217. +65 −50 download/download_path_reservation_tracker_unittest.cc
  218. +17 −15 download/download_prefs.cc
  219. +8 −7 download/download_prefs.h
  220. +12 −12 download/download_query_unittest.cc
  221. +1 −1  download/download_shelf_context_menu.cc
  222. +6 −6 download/download_status_updater_mac.mm
  223. +3 −3 download/download_status_updater_win.cc
  224. +3 −4 download/download_test_file_activity_observer.cc
  225. +10 −9 download/download_util.cc
  226. +3 −3 download/download_util.h
  227. +6 −6 download/save_package_file_picker.cc
  228. +3 −3 download/save_package_file_picker.h
  229. +5 −5 download/save_package_file_picker_chromeos.cc
  230. +3 −3 download/save_package_file_picker_chromeos.h
  231. +37 −39 download/save_page_browsertest.cc
  232. +4 −4 enumerate_modules_model_win.cc
  233. +4 −4 errorpage_browsertest.cc
  234. +1 −1  extensions/activity_database.cc
  235. +3 −3 extensions/activity_database_unittest.cc
  236. +2 −2 extensions/activity_log.cc
  237. +2 −2 extensions/activity_log_unittest.cc
  238. +1 −1  extensions/admin_policy_unittest.cc
  239. +4 −4 extensions/all_urls_apitest.cc
  240. +11 −10 extensions/api/bookmarks/bookmarks_api.cc
  241. +6 −4 extensions/api/content_settings/content_settings_apitest.cc
  242. +2 −2 extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
  243. +5 −5 extensions/api/developer_private/developer_private_api.cc
  244. +8 −6 extensions/api/developer_private/developer_private_api.h
  245. +4 −4 extensions/api/developer_private/developer_private_apitest.cc
  246. +4 −4 extensions/api/developer_private/entry_picker.cc
  247. +4 −4 extensions/api/developer_private/entry_picker.h
  248. +2 −2 extensions/api/downloads/downloads_api.cc
  249. +1 −1  extensions/api/downloads/downloads_api.h
  250. +17 −16 extensions/api/downloads/downloads_api_unittest.cc
  251. +40 −39 extensions/api/file_system/file_system_api.cc
  252. +8 −8 extensions/api/file_system/file_system_api.h
  253. +11 −11 extensions/api/file_system/file_system_api_unittest.cc
  254. +24 −23 extensions/api/file_system/file_system_apitest.cc
  255. +1 −1  extensions/api/managed_mode/managed_mode_apitest.cc
  256. +1 −1  extensions/api/management/management_api.cc
  257. +5 −5 extensions/api/management/management_api_browsertest.cc
  258. +4 −4 extensions/api/management/management_apitest.cc
  259. +7 −7 extensions/api/management/management_browsertest.cc
  260. +1 −1  extensions/api/media_galleries_private/media_galleries_private_apitest.cc
  261. +2 −2 extensions/api/media_galleries_private/media_galleries_watch_apitest.cc
  262. +10 −10 extensions/api/messaging/native_message_process_host_unittest.cc
  263. +1 −1  extensions/api/messaging/native_messaging_apitest_posix.cc
  264. +2 −2 extensions/api/messaging/native_process_launcher.cc
  265. +1 −1  extensions/api/messaging/native_process_launcher_posix.cc
  266. +1 −1  extensions/api/messaging/native_process_launcher_win.cc
  267. +3 −2 extensions/api/page_capture/page_capture_api.cc
  268. +3 −2 extensions/api/page_capture/page_capture_apitest.cc
  269. +1 −1  extensions/api/preference/preference_apitest.cc
  270. +6 −6 extensions/api/record/record_api.cc
  271. +5 −4 extensions/api/record/record_api.h
  272. +20 −19 extensions/api/record/record_api_test.cc
  273. +2 −1  extensions/api/serial/serial_connection.cc
  274. +2 −2 extensions/api/serial/serial_port_enumerator_posix.cc
  275. +2 −2 extensions/api/socket/socket_apitest.cc
  276. +1 −1  extensions/api/storage/leveldb_settings_storage_factory.cc
  277. +1 −1  extensions/api/storage/leveldb_settings_storage_factory.h
  278. +1 −1  extensions/api/storage/managed_value_store_cache.cc
  279. +2 −2 extensions/api/storage/managed_value_store_cache.h
  280. +2 −2 extensions/api/storage/policy_value_store_unittest.cc
  281. +3 −2 extensions/api/storage/settings_backend.cc
  282. +2 −2 extensions/api/storage/settings_backend.h
  283. +1 −1  extensions/api/storage/settings_frontend.cc
  284. +1 −1  extensions/api/storage/settings_storage_factory.h
  285. +1 −1  extensions/api/storage/settings_sync_unittest.cc
  286. +3 −3 extensions/api/storage/settings_test_util.cc
  287. +2 −2 extensions/api/storage/settings_test_util.h
  288. +4 −4 extensions/api/storage/sync_or_local_value_store_cache.cc
  289. +1 −1  extensions/api/sync_file_system/extension_sync_event_observer.cc
  290. +1 −1  extensions/api/sync_file_system/sync_file_system_apitest.cc
  291. +1 −1  extensions/api/system_indicator/system_indicator_apitest.cc
  292. +1 −1  extensions/api/system_info_cpu/cpu_info_provider_linux.cc
  293. +4 −3 extensions/api/system_info_storage/storage_info_provider_linux.cc
  294. +2 −2 extensions/api/system_info_storage/storage_info_provider_linux.h
  295. +3 −3 extensions/api/system_info_storage/storage_info_provider_linux_unittest.cc
  296. +1 −1  extensions/api/tabs/tabs_api.cc
  297. +1 −1  extensions/api/tabs/tabs_api.h
  298. +1 −1  extensions/api/web_request/web_request_api_unittest.cc
  299. +15 −13 extensions/api/webstore_private/webstore_private_apitest.cc
  300. +11 −11 extensions/app_background_page_apitest.cc
Sorry, we could not display the entire diff because too many files (965) changed.
10 android/crash_dump_manager.cc
View
@@ -59,7 +59,7 @@ CrashDumpManager::~CrashDumpManager() {
int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER));
- FilePath minidump_path;
+ base::FilePath minidump_path;
if (!file_util::CreateTemporaryFile(&minidump_path))
return base::kInvalidPlatformFileValue;
@@ -83,7 +83,7 @@ int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
return minidump_file;
}
-void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
+void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
base::ProcessHandle pid) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
int64 file_size = 0;
@@ -101,7 +101,7 @@ void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
// We are dealing with a valid minidump. Copy it to the crash report
// directory from where Java code will upload it later on.
- FilePath crash_dump_dir;
+ base::FilePath crash_dump_dir;
r = PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
if (!r) {
NOTREACHED() << "Failed to retrieve the crash dump directory.";
@@ -112,7 +112,7 @@ void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
const std::string filename =
base::StringPrintf("chromium-renderer-minidump-%016" PRIx64 ".dmp%d",
rand, pid);
- FilePath dest_path = crash_dump_dir.Append(filename);
+ base::FilePath dest_path = crash_dump_dir.Append(filename);
r = file_util::Move(minidump_path, dest_path);
if (!r) {
LOG(ERROR) << "Failed to move crash dump from " << minidump_path.value()
@@ -153,7 +153,7 @@ void CrashDumpManager::Observe(int type,
NOTREACHED();
return;
}
- FilePath minidump_path;
+ base::FilePath minidump_path;
{
base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_);
ChildProcessIDToMinidumpPath::iterator iter =
4 android/crash_dump_manager.h
View
@@ -45,9 +45,9 @@ class CrashDumpManager : public content::NotificationObserver {
// Should be created on the UI thread.
CrashDumpManager();
- typedef std::map<int, FilePath> ChildProcessIDToMinidumpPath;
+ typedef std::map<int, base::FilePath> ChildProcessIDToMinidumpPath;
- static void ProcessMinidump(const FilePath& minidump_path,
+ static void ProcessMinidump(const base::FilePath& minidump_path,
base::ProcessHandle pid);
// NotificationObserver implementation:
4 android/dev_tools_server.cc
View
@@ -56,8 +56,8 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
return use_bundled_frontend_resources_;
}
- virtual FilePath GetDebugFrontendDir() {
- return FilePath();
+ virtual base::FilePath GetDebugFrontendDir() {
+ return base::FilePath();
}
virtual std::string GetPageThumbnailData(const GURL& url) {
13 app_controller_mac.mm
View
@@ -157,7 +157,7 @@ void RecordLastRunAppBundlePath() {
// real, user-visible app bundle directory. (The alternatives give either the
// framework's path or the initial app's path, which may be an app mode shim
// or a unit test.)
- FilePath appBundlePath =
+ base::FilePath appBundlePath =
chrome::GetVersionedDirectory().DirName().DirName().DirName();
CFPreferencesSetAppValue(
base::mac::NSToCFCast(app_mode::kLastRunAppBundlePathPrefsKey),
@@ -1022,7 +1022,7 @@ - (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
int return_code;
StartupBrowserCreator browser_creator;
browser_creator.LaunchBrowser(
- command_line, [self lastProfile], FilePath(),
+ command_line, [self lastProfile], base::FilePath(),
chrome::startup::IS_NOT_PROCESS_STARTUP,
chrome::startup::IS_NOT_FIRST_RUN, &return_code);
}
@@ -1126,7 +1126,7 @@ - (void)openUrls:(const std::vector<GURL>&)urls {
CommandLine dummy(CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
- StartupBrowserCreatorImpl launch(FilePath(), dummy, first_run);
+ StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
launch.OpenURLsInBrowser(browser, false, urls);
}
@@ -1151,7 +1151,7 @@ - (void)launchPlatformApp:(NSAppleEventDescriptor*)event
stringValue];
ProfileManager* profileManager = g_browser_process->profile_manager();
- FilePath path = FilePath(base::SysNSStringToUTF8(profileDir));
+ base::FilePath path = base::FilePath(base::SysNSStringToUTF8(profileDir));
path = profileManager->user_data_dir().Append(path);
Profile* profile = profileManager->GetProfile(path);
if (!profile) {
@@ -1192,7 +1192,7 @@ - (void)submitCloudPrintJob:(NSAppleEventDescriptor*)event {
string16 printTicket16 = base::SysNSStringToUTF16(printTicket);
print_dialog_cloud::CreatePrintDialogForFile(
ProfileManager::GetDefaultProfile(), NULL,
- FilePath([inputPath UTF8String]), title16,
+ base::FilePath([inputPath UTF8String]), title16,
printTicket16, [mime UTF8String], /*delete_on_close=*/false);
}
}
@@ -1201,7 +1201,8 @@ - (void)application:(NSApplication*)sender
openFiles:(NSArray*)filenames {
std::vector<GURL> gurlVector;
for (NSString* file in filenames) {
- GURL gurl = net::FilePathToFileURL(FilePath(base::SysNSStringToUTF8(file)));
+ GURL gurl =
+ net::FilePathToFileURL(base::FilePath(base::SysNSStringToUTF8(file)));
gurlVector.push_back(gurl);
}
if (!gurlVector.empty())
5 autofill/autofill_browsertest.cc
View
@@ -255,8 +255,9 @@ class AutofillTest : public InProcessBrowserTest {
CHECK(test_server()->Start());
std::string data;
- FilePath data_file = ui_test_utils::GetTestFilePath(
- FilePath().AppendASCII("autofill"), FilePath().AppendASCII(filename));
+ base::FilePath data_file =
+ ui_test_utils::GetTestFilePath(base::FilePath().AppendASCII("autofill"),
+ base::FilePath().AppendASCII(filename));
CHECK(file_util::ReadFileToString(data_file, &data));
std::vector<std::string> lines;
base::SplitString(data, '\n', &lines);
4 autofill/autofill_merge_unittest.cc
View
@@ -20,8 +20,8 @@
namespace {
-const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
-const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
+const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
+const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
const char kFieldSeparator[] = ": ";
const char kProfileSeparator[] = "---";
26 autofill/data_driven_test.cc
View
@@ -14,7 +14,7 @@ namespace {
// Reads |file| into |content|, and converts Windows line-endings to Unix ones.
// Returns true on success.
-bool ReadFile(const FilePath& file, std::string* content) {
+bool ReadFile(const base::FilePath& file, std::string* content) {
if (!file_util::ReadFileToString(file, content))
return false;
@@ -23,7 +23,7 @@ bool ReadFile(const FilePath& file, std::string* content) {
}
// Write |content| to |file|. Returns true on success.
-bool WriteFile(const FilePath& file, const std::string& content) {
+bool WriteFile(const base::FilePath& file, const std::string& content) {
int write_size = file_util::WriteFile(file, content.c_str(),
content.length());
return write_size == static_cast<int>(content.length());
@@ -32,15 +32,15 @@ bool WriteFile(const FilePath& file, const std::string& content) {
} // namespace
void DataDrivenTest::RunDataDrivenTest(
- const FilePath& input_directory,
- const FilePath& output_directory,
- const FilePath::StringType& file_name_pattern) {
+ const base::FilePath& input_directory,
+ const base::FilePath& output_directory,
+ const base::FilePath::StringType& file_name_pattern) {
file_util::FileEnumerator input_files(input_directory,
false,
file_util::FileEnumerator::FILES,
file_name_pattern);
- for (FilePath input_file = input_files.Next();
+ for (base::FilePath input_file = input_files.Next();
!input_file.empty();
input_file = input_files.Next()) {
SCOPED_TRACE(input_file.BaseName().value());
@@ -51,7 +51,7 @@ void DataDrivenTest::RunDataDrivenTest(
std::string output;
GenerateResults(input, &output);
- FilePath output_file = output_directory.Append(
+ base::FilePath output_file = output_directory.Append(
input_file.BaseName().StripTrailingSeparators().ReplaceExtension(
FILE_PATH_LITERAL(".out")));
@@ -63,9 +63,9 @@ void DataDrivenTest::RunDataDrivenTest(
}
}
-FilePath DataDrivenTest::GetInputDirectory(
- const FilePath::StringType& test_name) {
- FilePath test_data_dir_;
+base::FilePath DataDrivenTest::GetInputDirectory(
+ const base::FilePath::StringType& test_name) {
+ base::FilePath test_data_dir_;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("autofill")
.Append(test_name)
@@ -73,9 +73,9 @@ FilePath DataDrivenTest::GetInputDirectory(
return test_data_dir_;
}
-FilePath DataDrivenTest::GetOutputDirectory(
- const FilePath::StringType& test_name) {
- FilePath test_data_dir_;
+base::FilePath DataDrivenTest::GetOutputDirectory(
+ const base::FilePath::StringType& test_name) {
+ base::FilePath test_data_dir_;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("autofill")
.Append(test_name)
13 autofill/data_driven_test.h
View
@@ -22,9 +22,9 @@ class DataDrivenTest {
// |GenerateResults()|. If the corresponding output file already exists in
// the |output_directory|, verifies that the results match the file contents;
// otherwise, writes a gold result file to the |output_directory|.
- void RunDataDrivenTest(const FilePath& input_directory,
- const FilePath& output_directory,
- const FilePath::StringType& file_name_pattern);
+ void RunDataDrivenTest(const base::FilePath& input_directory,
+ const base::FilePath& output_directory,
+ const base::FilePath::StringType& file_name_pattern);
// Given the |input| data, generates the |output| results. The output results
// must be stable across runs.
@@ -33,10 +33,11 @@ class DataDrivenTest {
virtual void GenerateResults(const std::string& input,
std::string* output) = 0;
- // Return |FilePath|s to the test input and output subdirectories
+ // Return |base::FilePath|s to the test input and output subdirectories
// ../autofill/|test_name|/input and ../autofill/|test_name|/output.
- FilePath GetInputDirectory(const FilePath::StringType& test_name);
- FilePath GetOutputDirectory(const FilePath::StringType& test_name);
+ base::FilePath GetInputDirectory(const base::FilePath::StringType& test_name);
+ base::FilePath GetOutputDirectory(
+ const base::FilePath::StringType& test_name);
protected:
DataDrivenTest();
59 autofill/form_structure_browsertest.cc
View
@@ -20,7 +20,7 @@
namespace {
-const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("heuristics");
+const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("heuristics");
// Convert the |html| snippet to a data URI.
GURL HTMLToDataURI(const std::string& html) {
@@ -104,14 +104,16 @@ std::string FormStructureBrowserTest::FormStructuresToString(
#define MAYBE_DataDrivenHeuristics(n) DataDrivenHeuristics##n
#endif
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics00) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("00_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("00_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
}
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics01) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("01_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("01_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -119,7 +121,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics01) {
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(02)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("02_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("02_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -127,7 +130,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(03)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("03_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("03_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -135,7 +139,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(04)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("04_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("04_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -143,7 +148,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(05)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("05_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("05_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -151,7 +157,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(06)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("06_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("06_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -159,7 +166,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(07)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("07_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("07_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -167,7 +175,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(08)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("08_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("08_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -175,7 +184,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(09)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("09_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("09_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -183,7 +193,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(10)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("10_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("10_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -191,7 +202,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(11)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("11_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("11_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -199,7 +211,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(12)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("12_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("12_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -207,7 +220,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(13)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("13_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("13_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -215,7 +229,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(14)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("14_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("14_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -223,7 +238,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(15)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("15_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("15_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -231,7 +247,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(16)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("16_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("16_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -239,7 +256,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(17)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("17_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("17_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
@@ -247,7 +265,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(20)) {
- const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("20_*.html");
+ const base::FilePath::CharType kFileNamePattern[] =
+ FILE_PATH_LITERAL("20_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
2  automation/automation_provider_observers.cc
View
@@ -1745,7 +1745,7 @@ void SavePackageNotificationObserver::ManagerGoingDown(
PageSnapshotTaker::PageSnapshotTaker(AutomationProvider* automation,
IPC::Message* reply_message,
WebContents* web_contents,
- const FilePath& path)
+ const base::FilePath& path)
: automation_(automation->AsWeakPtr()),
reply_message_(reply_message),
web_contents_(web_contents),
4 automation/automation_provider_observers.h
View
@@ -1274,7 +1274,7 @@ class PageSnapshotTaker : public TabEventObserver,
PageSnapshotTaker(AutomationProvider* automation,
IPC::Message* reply_message,
content::WebContents* web_contents,
- const FilePath& path);
+ const base::FilePath& path);
virtual ~PageSnapshotTaker();
// Start the process of taking a snapshot of the entire page.
@@ -1298,7 +1298,7 @@ class PageSnapshotTaker : public TabEventObserver,
base::WeakPtr<AutomationProvider> automation_;
scoped_ptr<IPC::Message> reply_message_;
content::WebContents* web_contents_;
- FilePath image_path_;
+ base::FilePath image_path_;
content::NotificationRegistrar registrar_;
DISALLOW_COPY_AND_ASSIGN(PageSnapshotTaker);
2  automation/automation_tab_helper_browsertest.cc
View
@@ -107,7 +107,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
}
protected:
- FilePath test_data_dir_;
+ base::FilePath test_data_dir_;
};
IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, FormSubmission) {
36 automation/testing_automation_provider.cc
View
@@ -202,7 +202,7 @@ void SendSuccessReply(base::WeakPtr<AutomationProvider> automation,
// Helper to process the result of CanEnablePlugin.
void DidEnablePlugin(base::WeakPtr<AutomationProvider> automation,
IPC::Message* reply_message,
- const FilePath::StringType& path,
+ const base::FilePath::StringType& path,
const std::string& error_msg,
bool did_enable) {
if (did_enable) {
@@ -1155,13 +1155,13 @@ void TestingAutomationProvider::CloseBrowserWindow(
void TestingAutomationProvider::OpenProfileWindow(
base::DictionaryValue* args, IPC::Message* reply_message) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
- FilePath::StringType path;
+ base::FilePath::StringType path;
if (!args->GetString("path", &path)) {
AutomationJSONReply(this, reply_message).SendError(
"Invalid or missing arg: 'path'");
return;
}
- Profile* profile = profile_manager->GetProfileByPath(FilePath(path));
+ Profile* profile = profile_manager->GetProfileByPath(base::FilePath(path));
if (!profile) {
AutomationJSONReply(this, reply_message).SendError(
StringPrintf("Invalid profile path: %s", path.c_str()));
@@ -2241,7 +2241,7 @@ void TestingAutomationProvider::GetBrowserInfo(
chrome::kHelperProcessExecutablePath);
properties->SetString("command_line_string",
CommandLine::ForCurrentProcess()->GetCommandLineString());
- FilePath dumps_path;
+ base::FilePath dumps_path;
PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
properties->SetString("DIR_CRASH_DUMPS", dumps_path.value());
#if defined(USE_AURA)
@@ -2633,7 +2633,7 @@ void TestingAutomationProvider::PerformActionOnDownload(
} else if (action == "toggle_open_files_like_this") {
DownloadPrefs* prefs =
DownloadPrefs::FromBrowserContext(selected_item->GetBrowserContext());
- FilePath path = selected_item->GetUserVerifiedFilePath();
+ base::FilePath path = selected_item->GetUserVerifiedFilePath();
if (!selected_item->ShouldOpenFileBasedOnExtension())
prefs->EnableAutoOpenBasedOnExtension(path);
else
@@ -3187,13 +3187,13 @@ void TestingAutomationProvider::GetPluginsInfoCallback(
void TestingAutomationProvider::EnablePlugin(Browser* browser,
DictionaryValue* args,
IPC::Message* reply_message) {
- FilePath::StringType path;
+ base::FilePath::StringType path;
if (!args->GetString("path", &path)) {
AutomationJSONReply(this, reply_message).SendError("path not specified.");
return;
}
PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
- plugin_prefs->EnablePlugin(true, FilePath(path),
+ plugin_prefs->EnablePlugin(true, base::FilePath(path),
base::Bind(&DidEnablePlugin, AsWeakPtr(), reply_message,
path, "Could not enable plugin for path %s."));
}
@@ -3204,13 +3204,13 @@ void TestingAutomationProvider::EnablePlugin(Browser* browser,
void TestingAutomationProvider::DisablePlugin(Browser* browser,
DictionaryValue* args,
IPC::Message* reply_message) {
- FilePath::StringType path;
+ base::FilePath::StringType path;
if (!args->GetString("path", &path)) {
AutomationJSONReply(this, reply_message).SendError("path not specified.");
return;
}
PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
- plugin_prefs->EnablePlugin(false, FilePath(path),
+ plugin_prefs->EnablePlugin(false, base::FilePath(path),
base::Bind(&DidEnablePlugin, AsWeakPtr(), reply_message,
path, "Could not disable plugin for path %s."));
}
@@ -3226,8 +3226,8 @@ void TestingAutomationProvider::SaveTabContents(
DictionaryValue* args,
IPC::Message* reply_message) {
int tab_index = 0;
- FilePath::StringType filename;
- FilePath::StringType parent_directory;
+ base::FilePath::StringType filename;
+ base::FilePath::StringType parent_directory;
WebContents* web_contents = NULL;
if (!args->GetInteger("tab_index", &tab_index) ||
@@ -3244,10 +3244,10 @@ void TestingAutomationProvider::SaveTabContents(
}
// We're doing a SAVE_AS_ONLY_HTML so the the directory path isn't
// used. Nevertheless, SavePackage requires it be valid. Sigh.
- parent_directory = FilePath(filename).DirName().value();
+ parent_directory = base::FilePath(filename).DirName().value();
if (!web_contents->SavePage(
- FilePath(filename),
- FilePath(parent_directory),
+ base::FilePath(filename),
+ base::FilePath(parent_directory),
content::SAVE_PAGE_TYPE_AS_ONLY_HTML)) {
AutomationJSONReply(this, reply_message).SendError(
"Could not initiate SavePage");
@@ -3578,7 +3578,7 @@ void TestingAutomationProvider::IsFindInPageVisible(
void TestingAutomationProvider::InstallExtension(
DictionaryValue* args, IPC::Message* reply_message) {
- FilePath::StringType path_string;
+ base::FilePath::StringType path_string;
bool with_ui;
bool from_webstore = false;
Browser* browser;
@@ -3612,7 +3612,7 @@ void TestingAutomationProvider::InstallExtension(
this,
reply_message);
- FilePath extension_path(path_string);
+ base::FilePath extension_path(path_string);
// If the given path has a 'crx' extension, assume it is a packed extension
// and install it. Otherwise load it as an unpacked extension.
if (extension_path.MatchesExtension(FILE_PATH_LITERAL(".crx"))) {
@@ -5482,7 +5482,7 @@ void TestingAutomationProvider::CaptureEntirePageJSON(
return;
}
- FilePath::StringType path_str;
+ base::FilePath::StringType path_str;
if (!args->GetString("path", &path_str)) {
AutomationJSONReply(this, reply_message)
.SendError("'path' missing or invalid");
@@ -5491,7 +5491,7 @@ void TestingAutomationProvider::CaptureEntirePageJSON(
RenderViewHost* render_view = web_contents->GetRenderViewHost();
if (render_view) {
- FilePath path(path_str);
+ base::FilePath path(path_str);
// This will delete itself when finished.
PageSnapshotTaker* snapshot_taker = new PageSnapshotTaker(
this, reply_message, web_contents, path);
4 background/background_application_list_model_unittest.cc
View
@@ -36,8 +36,8 @@ using extensions::APIPermission;
using extensions::Extension;
// For ExtensionService interface when it requires a path that is not used.
-FilePath bogus_file_path() {
- return FilePath(FILE_PATH_LITERAL("//foobar_nonexistent"));
+base::FilePath bogus_file_path() {
+ return base::FilePath(FILE_PATH_LITERAL("//foobar_nonexistent"));
}
class BackgroundApplicationListModelTest : public ExtensionServiceTestBase {
10 background/background_mode_manager.cc
View
@@ -398,7 +398,7 @@ void BackgroundModeManager::OnApplicationListChanged(Profile* profile) {
///////////////////////////////////////////////////////////////////////////////
// BackgroundModeManager, ProfileInfoCacheObserver overrides
-void BackgroundModeManager::OnProfileAdded(const FilePath& profile_path) {
+void BackgroundModeManager::OnProfileAdded(const base::FilePath& profile_path) {
ProfileInfoCache& cache =
g_browser_process->profile_manager()->GetProfileInfoCache();
string16 profile_name = cache.GetNameOfProfileAtIndex(
@@ -419,7 +419,7 @@ void BackgroundModeManager::OnProfileAdded(const FilePath& profile_path) {
}
void BackgroundModeManager::OnProfileWillBeRemoved(
- const FilePath& profile_path) {
+ const base::FilePath& profile_path) {
ProfileInfoCache& cache =
g_browser_process->profile_manager()->GetProfileInfoCache();
string16 profile_name = cache.GetNameOfProfileAtIndex(
@@ -435,12 +435,12 @@ void BackgroundModeManager::OnProfileWillBeRemoved(
}
void BackgroundModeManager::OnProfileWasRemoved(
- const FilePath& profile_path,
+ const base::FilePath& profile_path,
const string16& profile_name) {
}
void BackgroundModeManager::OnProfileNameChanged(
- const FilePath& profile_path,
+ const base::FilePath& profile_path,
const string16& old_profile_name) {
ProfileInfoCache& cache =
g_browser_process->profile_manager()->GetProfileInfoCache();
@@ -458,7 +458,7 @@ void BackgroundModeManager::OnProfileNameChanged(
}
void BackgroundModeManager::OnProfileAvatarChanged(
- const FilePath& profile_path) {
+ const base::FilePath& profile_path) {
}
///////////////////////////////////////////////////////////////////////////////
12 background/background_mode_manager.h
View
@@ -167,13 +167,15 @@ class BackgroundModeManager
virtual void OnApplicationListChanged(Profile* profile) OVERRIDE;
// Overrides from ProfileInfoCacheObserver
- virtual void OnProfileAdded(const FilePath& profile_path) OVERRIDE;
- virtual void OnProfileWillBeRemoved(const FilePath& profile_path) OVERRIDE;
- virtual void OnProfileWasRemoved(const FilePath& profile_path,
+ virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
+ virtual void OnProfileWillBeRemoved(
+ const base::FilePath& profile_path) OVERRIDE;
+ virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
const string16& profile_name) OVERRIDE;
- virtual void OnProfileNameChanged(const FilePath& profile_path,
+ virtual void OnProfileNameChanged(const base::FilePath& profile_path,
const string16& old_profile_name) OVERRIDE;
- virtual void OnProfileAvatarChanged(const FilePath& profile_path) OVERRIDE;
+ virtual void OnProfileAvatarChanged(
+ const base::FilePath& profile_path) OVERRIDE;
// Overrides from SimpleMenuModel::Delegate implementation.
virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
4 bookmarks/bookmark_codec_unittest.cc
View
@@ -297,9 +297,9 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
}
TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
- FilePath test_data_directory;
+ base::FilePath test_data_directory;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory));
- FilePath test_file = test_data_directory.AppendASCII(
+ base::FilePath test_file = test_data_directory.AppendASCII(
"bookmarks/model_without_sync.json");
ASSERT_TRUE(file_util::PathExists(test_file));
8 bookmarks/bookmark_html_writer.cc
View
@@ -89,7 +89,7 @@ const size_t kIndentSize = 4;
class Writer : public base::RefCountedThreadSafe<Writer> {
public:
Writer(base::Value* bookmarks,
- const FilePath& path,
+ const base::FilePath& path,
BookmarkFaviconFetcher::URLFaviconMap* favicons_map,
BookmarksExportObserver* observer)
: bookmarks_(bookmarks),
@@ -363,7 +363,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
scoped_ptr<Value> bookmarks_;
// Path we're writing to.
- FilePath path_;
+ base::FilePath path_;
// Map that stores favicon per URL.
scoped_ptr<BookmarkFaviconFetcher::URLFaviconMap> favicons_map_;
@@ -385,7 +385,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
BookmarkFaviconFetcher::BookmarkFaviconFetcher(
Profile* profile,
- const FilePath& path,
+ const base::FilePath& path,
BookmarksExportObserver* observer)
: profile_(profile),
path_(path),
@@ -495,7 +495,7 @@ void BookmarkFaviconFetcher::OnFaviconDataAvailable(
namespace bookmark_html_writer {
void WriteBookmarks(Profile* profile,
- const FilePath& path,
+ const base::FilePath& path,
BookmarksExportObserver* observer) {
// BookmarkModel isn't thread safe (nor would we want to lock it down
// for the duration of the write), as such we make a copy of the
6 bookmarks/bookmark_html_writer.h
View
@@ -43,7 +43,7 @@ class BookmarkFaviconFetcher: public content::NotificationObserver {
URLFaviconMap;
BookmarkFaviconFetcher(Profile* profile,
- const FilePath& path,
+ const base::FilePath& path,
BookmarksExportObserver* observer);
virtual ~BookmarkFaviconFetcher();
@@ -86,7 +86,7 @@ class BookmarkFaviconFetcher: public content::NotificationObserver {
scoped_ptr<URLFaviconMap> favicons_map_;
// Path where html output is stored.
- FilePath path_;
+ base::FilePath path_;
BookmarksExportObserver* observer_;
@@ -103,7 +103,7 @@ namespace bookmark_html_writer {
// Before writing to the file favicons are fetched on the main thread.
// TODO(sky): need a callback on failure.
void WriteBookmarks(Profile* profile,
- const FilePath& path,
+ const base::FilePath& path,
BookmarksExportObserver* observer);
} // namespace bookmark_html_writer
2  bookmarks/bookmark_html_writer_unittest.cc
View
@@ -119,7 +119,7 @@ class BookmarkHTMLWriterTest : public testing::Test {
}
base::ScopedTempDir temp_dir_;
- FilePath path_;
+ base::FilePath path_;
};
// Class that will notify message loop when file is written.
6 bookmarks/bookmark_node_data.cc
View
@@ -208,7 +208,7 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
}
bool BookmarkNodeData::ReadFromClipboard() {
- FilePath file_path;
+ base::FilePath file_path;
if (!bookmark_pasteboard_helper_mac::ReadFromPasteboard(
bookmark_pasteboard_helper_mac::kCopyPastePasteboard,
elements,
@@ -221,7 +221,7 @@ bool BookmarkNodeData::ReadFromClipboard() {
}
bool BookmarkNodeData::ReadFromDragClipboard() {
- FilePath file_path;
+ base::FilePath file_path;
if (!bookmark_pasteboard_helper_mac::ReadFromPasteboard(
bookmark_pasteboard_helper_mac::kDragPasteboard,
elements,
@@ -284,7 +284,7 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
#endif
void BookmarkNodeData::WriteToPickle(Profile* profile, Pickle* pickle) const {
- FilePath path = profile ? profile->GetPath() : FilePath();
+ base::FilePath path = profile ? profile->GetPath() : base::FilePath();
path.WriteToPickle(pickle);
pickle->WriteUInt64(elements.size());
2  bookmarks/bookmark_node_data.h
View
@@ -161,7 +161,7 @@ struct BookmarkNodeData {
private:
// Path of the profile we originated from.
- FilePath profile_path_;
+ base::FilePath profile_path_;
};
#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_NODE_DATA_H_
6 bookmarks/bookmark_pasteboard_helper_mac.mm
View
@@ -242,7 +242,7 @@ void WriteSimplifiedBookmarkTypes(NSPasteboard* pb,
void WriteToPasteboard(PasteboardType type,
const std::vector<BookmarkNodeData::Element>& elements,
- const FilePath& profile_path) {
+ const base::FilePath& profile_path) {
if (elements.empty())
return;
@@ -264,12 +264,12 @@ void WriteToPasteboard(PasteboardType type,
bool ReadFromPasteboard(PasteboardType type,
std::vector<BookmarkNodeData::Element>& elements,
- FilePath* profile_path) {
+ base::FilePath* profile_path) {
NSPasteboard* pb = PasteboardFromType(type);
elements.clear();
NSString* profile = [pb stringForType:kChromiumProfilePathPboardType];
- *profile_path = FilePath(base::SysNSStringToUTF8(profile));
+ *profile_path = base::FilePath(base::SysNSStringToUTF8(profile));
return ReadBookmarkDictionaryListPboardType(pb, elements) ||
ReadWebURLsWithTitlesPboardType(pb, elements) ||
ReadNSURLPboardType(pb, elements);
8 bookmarks/bookmark_storage.cc
View
@@ -26,13 +26,13 @@ using content::BrowserThread;
namespace {
// Extension used for backup files (copy of main file created during startup).
-const FilePath::CharType kBackupExtension[] = FILE_PATH_LITERAL("bak");
+const base::FilePath::CharType kBackupExtension[] = FILE_PATH_LITERAL("bak");
// How often we save.
const int kSaveDelayMS = 2500;
-void BackupCallback(const FilePath& path) {
- FilePath backup_path = path.ReplaceExtension(kBackupExtension);
+void BackupCallback(const base::FilePath& path) {
+ base::FilePath backup_path = path.ReplaceExtension(kBackupExtension);
file_util::CopyFile(path, backup_path);
}
@@ -48,7 +48,7 @@ void AddBookmarksToIndex(BookmarkLoadDetails* details,
}
}
-void LoadCallback(const FilePath& path,
+void LoadCallback(const base::FilePath& path,
BookmarkStorage* storage,
BookmarkLoadDetails* details) {
startup_metric_utils::ScopedSlowStartupUMA
39 browser_encoding_browsertest.cc
View
@@ -101,7 +101,8 @@ class SavePackageFinishedObserver : public content::DownloadManager::Observer {
using content::BrowserThread;
-static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("encoding_tests");
+static const base::FilePath::CharType* kTestDir =
+ FILE_PATH_LITERAL("encoding_tests");
class BrowserEncodingTest
: public InProcessBrowserTest,
@@ -111,10 +112,11 @@ class BrowserEncodingTest
// Saves the current page and verifies that the output matches the expected
// result.
- void SaveAndCompare(const char* filename_to_write, const FilePath& expected) {
+ void SaveAndCompare(const char* filename_to_write,
+ const base::FilePath& expected) {
// Dump the page, the content of dump page should be identical to the
// expected result file.
- FilePath full_file_name = save_dir_.AppendASCII(filename_to_write);
+ base::FilePath full_file_name = save_dir_.AppendASCII(filename_to_write);
// We save the page as way of complete HTML file, which requires a directory
// name to save sub resources in it. Although this test file does not have
// sub resources, but the directory name is still required.
@@ -128,8 +130,8 @@ class BrowserEncodingTest
content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML);
loop_runner->Run();
- FilePath expected_file_name = ui_test_utils::GetTestFilePath(
- FilePath(kTestDir), expected);
+ base::FilePath expected_file_name = ui_test_utils::GetTestFilePath(
+ base::FilePath(kTestDir), expected);
EXPECT_TRUE(file_util::ContentsEqual(full_file_name, expected_file_name));
}
@@ -145,8 +147,8 @@ class BrowserEncodingTest
}
base::ScopedTempDir temp_dir_;
- FilePath save_dir_;
- FilePath temp_sub_resource_dir_;
+ base::FilePath save_dir_;
+ base::FilePath temp_sub_resource_dir_;
};
// TODO(jnd): 1. Some encodings are missing here. It'll be added later. See
@@ -157,8 +159,9 @@ class BrowserEncodingTest
IN_PROC_BROWSER_TEST_P(BrowserEncodingTest, TestEncodingAliasMapping) {
const char* const kAliasTestDir = "alias_mapping";
- FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kAliasTestDir);
- FilePath test_file_path(test_dir_path);
+ base::FilePath test_dir_path = base::FilePath(kTestDir).AppendASCII(
+ kAliasTestDir);
+ base::FilePath test_file_path(test_dir_path);
test_file_path = test_file_path.AppendASCII(
GetParam().file_name);
@@ -180,7 +183,8 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
"expected_gb18030_saved_from_iso88591_meta.html";
const char* const kOverrideTestDir = "user_override";
- FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kOverrideTestDir);
+ base::FilePath test_dir_path =
+ base::FilePath(kTestDir).AppendASCII(kOverrideTestDir);
test_dir_path = test_dir_path.AppendASCII(kTestFileName);
GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
ui_test_utils::NavigateToURL(browser(), url);
@@ -198,8 +202,9 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
navigation_observer.Wait();
EXPECT_EQ("gb18030", web_contents->GetEncoding());
- FilePath expected_filename =
- FilePath().AppendASCII(kOverrideTestDir).AppendASCII(kExpectedFileName);
+ base::FilePath expected_filename =
+ base::FilePath().AppendASCII(kOverrideTestDir).AppendASCII(
+ kExpectedFileName);
SaveAndCompare(kTestFileName, expected_filename);
}
@@ -282,7 +287,8 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
// Directory of the files of expected results.
const char* const kExpectedResultDir = "expected_results";
- FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kAutoDetectDir);
+ base::FilePath test_dir_path =
+ base::FilePath(kTestDir).AppendASCII(kAutoDetectDir);
// Set the default charset to one of encodings not supported by the current
// auto-detector (Please refer to the above comments) to make sure we
@@ -297,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kWebKitUsesUniversalDetector, false);
- FilePath test_file_path(test_dir_path);
+ base::FilePath test_file_path(test_dir_path);
test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name);
GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
ui_test_utils::NavigateToURL(browser(), url);
@@ -321,8 +327,9 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
// Dump the page, the content of dump page should be equal with our expect
// result file.
- FilePath expected_result_file_name =
- FilePath().AppendASCII(kAutoDetectDir).AppendASCII(kExpectedResultDir).
+ base::FilePath expected_result_file_name =
+ base::FilePath().AppendASCII(kAutoDetectDir).
+ AppendASCII(kExpectedResultDir).
AppendASCII(kTestDatas[i].expected_result);
SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
}
6 browser_process_impl.cc
View
@@ -788,7 +788,7 @@ void BrowserProcessImpl::CreateProfileManager() {
DCHECK(!created_profile_manager_ && profile_manager_.get() == NULL);
created_profile_manager_ = true;
- FilePath user_data_dir;
+ base::FilePath user_data_dir;
PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
profile_manager_.reset(new ProfileManager(user_data_dir));
}
@@ -797,7 +797,7 @@ void BrowserProcessImpl::CreateLocalState() {
DCHECK(!created_local_state_ && local_state_.get() == NULL);
created_local_state_ = true;
- FilePath local_state_path;
+ base::FilePath local_state_path;
CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
scoped_refptr<PrefRegistrySimple> pref_registry = new PrefRegistrySimple;
local_state_.reset(
@@ -854,7 +854,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
#if defined(OS_POSIX)
// Also find plugins in a user-specific plugins dir,
// e.g. ~/.config/chromium/Plugins.
- FilePath user_data_dir;
+ base::FilePath user_data_dir;
if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
#endif
8 browser_shutdown.cc
View
@@ -114,8 +114,8 @@ void OnShutdownStarting(ShutdownType type) {
}
}
-FilePath GetShutdownMsPath() {
- FilePath shutdown_ms_file;
+base::FilePath GetShutdownMsPath() {
+ base::FilePath shutdown_ms_file;
PathService::Get(chrome::DIR_USER_DATA, &shutdown_ms_file);
return shutdown_ms_file.AppendASCII(kShutdownMsFile);
}
@@ -248,7 +248,7 @@ void ShutdownPostThreadsStop(bool restart_last_session) {
std::string shutdown_ms =
base::Int64ToString(shutdown_delta.InMilliseconds());
int len = static_cast<int>(shutdown_ms.length()) + 1;
- FilePath shutdown_ms_file = GetShutdownMsPath();
+ base::FilePath shutdown_ms_file = GetShutdownMsPath();
file_util::WriteFile(shutdown_ms_file, shutdown_ms.c_str(), len);
}
@@ -262,7 +262,7 @@ void ReadLastShutdownFile(ShutdownType type,
int num_procs_slow) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- FilePath shutdown_ms_file = GetShutdownMsPath();
+ base::FilePath shutdown_ms_file = GetShutdownMsPath();
std::string shutdown_ms_str;
int64 shutdown_ms = 0;
if (file_util::ReadFileToString(shutdown_ms_file, &shutdown_ms_str))
2  browser_util_win.cc
View
@@ -17,7 +17,7 @@ namespace browser_util {
bool IsBrowserAlreadyRunning() {
static HANDLE handle = NULL;
- FilePath exe_path;
+ base::FilePath exe_path;
PathService::Get(base::FILE_EXE, &exe_path);
std::wstring exe = exe_path.value();
std::replace(exe.begin(), exe.end(), '\\', '!');
3  browsing_data/browsing_data_database_helper.cc
View
@@ -92,7 +92,8 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() {
ori->GetAllDatabaseNames(&databases);
for (std::vector<string16>::const_iterator db = databases.begin();
db != databases.end(); ++db) {
- FilePath file_path = tracker_->GetFullDBFilePath(ori->GetOrigin(), *db);
+ base::FilePath file_path =
+ tracker_->GetFullDBFilePath(ori->GetOrigin(), *db);
base::PlatformFileInfo file_info;
if (file_util::GetFileInfo(file_path, &file_info)) {
database_info_.push_back(DatabaseInfo(
5 browsing_data/browsing_data_database_helper_browsertest.cc
View
@@ -39,14 +39,15 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
string16 identifier1(UTF8ToUTF16(kTestIdentifier1));
db_tracker->DatabaseOpened(identifier1, db_name, description, 1, &size);
db_tracker->DatabaseClosed(identifier1, db_name);
- FilePath db_path1 = db_tracker->GetFullDBFilePath(identifier1, db_name);
+ base::FilePath db_path1 =
+ db_tracker->GetFullDBFilePath(identifier1, db_name);
file_util::CreateDirectory(db_path1.DirName());
ASSERT_EQ(0, file_util::WriteFile(db_path1, NULL, 0));
string16 identifierExtension(UTF8ToUTF16(kTestIdentifierExtension));
db_tracker->DatabaseOpened(identifierExtension, db_name, description, 1,
&size);
db_tracker->DatabaseClosed(identifierExtension, db_name);
- FilePath db_path2 =
+ base::FilePath db_path2 =
db_tracker->GetFullDBFilePath(identifierExtension, db_name);
file_util::CreateDirectory(db_path2.DirName());
ASSERT_EQ(0, file_util::WriteFile(db_path2, NULL, 0));
5 browsing_data/browsing_data_file_system_helper_unittest.cc
View
@@ -173,8 +173,9 @@ class BrowsingDataFileSystemHelperTest : public testing::Test {
// specified origin.
void CreateDirectoryForOriginAndType(const GURL& origin,
fileapi::FileSystemType type) {
- FilePath target = sandbox_->GetFileSystemRootPathOnFileThread(
- fileapi::FileSystemURL::CreateForTest(origin, type, FilePath()), true);
+ base::FilePath target = sandbox_->GetFileSystemRootPathOnFileThread(
+ fileapi::FileSystemURL::CreateForTest(origin, type, base::FilePath()),
+ true);
EXPECT_TRUE(file_util::DirectoryExists(target));
}
20 browsing_data/browsing_data_local_storage_helper_browsertest.cc
View
@@ -32,19 +32,19 @@ typedef
BrowsingDataHelperCallback<BrowsingDataLocalStorageHelper::LocalStorageInfo>
TestCompletionCallback;
-const FilePath::CharType kTestFile0[] =
+const base::FilePath::CharType kTestFile0[] =
FILE_PATH_LITERAL("http_www.chromium.org_0.localstorage");
const char kOriginOfTestFile0[] = "http://www.chromium.org/";
-const FilePath::CharType kTestFile1[] =
+const base::FilePath::CharType kTestFile1[] =
FILE_PATH_LITERAL("http_www.google.com_0.localstorage");
-const FilePath::CharType kTestFileInvalid[] =
+const base::FilePath::CharType kTestFileInvalid[] =
FILE_PATH_LITERAL("http_www.google.com_localstorage_0.foo");
// This is only here to test that extension state is not listed by the helper.
-const FilePath::CharType kTestFileExtension[] = FILE_PATH_LITERAL(
+const base::FilePath::CharType kTestFileExtension[] = FILE_PATH_LITERAL(
"chrome-extension_behllobkkfkfnphdnhnkndlbkcpglgmj_0.localstorage");
class BrowsingDataLocalStorageHelperTest : public InProcessBrowserTest {
@@ -52,18 +52,18 @@ class BrowsingDataLocalStorageHelperTest : public InProcessBrowserTest {
void CreateLocalStorageFilesForTest() {
// Note: This helper depends on details of how the dom_storage library
// stores data in the host file system.
- FilePath storage_path = GetLocalStoragePathForTestingProfile();
+ base::FilePath storage_path = GetLocalStoragePathForTestingProfile();
file_util::CreateDirectory(storage_path);
- const FilePath::CharType* kFilesToCreate[] = {
+ const base::FilePath::CharType* kFilesToCreate[] = {
kTestFile0, kTestFile1, kTestFileInvalid, kTestFileExtension
};
for (size_t i = 0; i < arraysize(kFilesToCreate); ++i) {
- FilePath file_path = storage_path.Append(kFilesToCreate[i]);
+ base::FilePath file_path = storage_path.Append(kFilesToCreate[i]);
file_util::WriteFile(file_path, NULL, 0);
}
}
- FilePath GetLocalStoragePathForTestingProfile() {
+ base::FilePath GetLocalStoragePathForTestingProfile() {
return browser()->profile()->GetPath().AppendASCII("Local Storage");
}
};
@@ -134,10 +134,10 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) {
false,
file_util::FileEnumerator::FILES);
int num_files = 0;
- for (FilePath file_path = file_enumerator.Next();
+ for (base::FilePath file_path = file_enumerator.Next();
!file_path.empty();
file_path = file_enumerator.Next()) {
- ASSERT_FALSE(FilePath(kTestFile0) == file_path.BaseName());
+ ASSERT_FALSE(base::FilePath(kTestFile0) == file_path.BaseName());
++num_files;
}
ASSERT_EQ(3, num_files);
10 browsing_data/browsing_data_remover_browsertest.cc
View
@@ -27,7 +27,7 @@
using content::BrowserThread;
namespace {
-void SetUrlRequestMock(const FilePath& path) {
+void SetUrlRequestMock(const base::FilePath& path) {
content::URLRequestMockHTTPJob::AddUrlHandler(path);
}
}
@@ -37,7 +37,7 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
BrowsingDataRemoverBrowserTest() {}
virtual void SetUpOnMainThread() OVERRIDE {
- FilePath path;
+ base::FilePath path;
PathService::Get(content::DIR_TEST_DATA, &path);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
@@ -78,8 +78,8 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Download) {
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
GURL download_url = ui_test_utils::GetTestUrl(
- FilePath().AppendASCII("downloads"),
- FilePath().AppendASCII("a_zip_file.zip"));
+ base::FilePath().AppendASCII("downloads"),
+ base::FilePath().AppendASCII("a_zip_file.zip"));
ui_test_utils::NavigateToURL(browser(), download_url);
observer->WaitForFinished();
@@ -97,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Download) {
// Verify can modify database after deleting it.
IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Database) {
GURL url(content::URLRequestMockHTTPJob::GetMockUrl(
- FilePath().AppendASCII("simple_database.html")));
+ base::FilePath().AppendASCII("simple_database.html")));
ui_test_utils::NavigateToURL(browser(), url);
RunScriptAndCheckResult("createTable()", "done");
11 browsing_data/browsing_data_remover_unittest.cc
View
@@ -66,16 +66,16 @@ const GURL kOrigin3(kTestOrigin3);
const GURL kOriginExt(kTestOriginExt);
const GURL kOriginDevTools(kTestOriginDevTools);
-const FilePath::CharType kDomStorageOrigin1[] =
+const base::FilePath::CharType kDomStorageOrigin1[] =
FILE_PATH_LITERAL("http_host1_1.localstorage");
-const FilePath::CharType kDomStorageOrigin2[] =
+const base::FilePath::CharType kDomStorageOrigin2[] =
FILE_PATH_LITERAL("http_host2_1.localstorage");
-const FilePath::CharType kDomStorageOrigin3[] =
+const base::FilePath::CharType kDomStorageOrigin3[] =
FILE_PATH_LITERAL("http_host3_1.localstorage");
-const FilePath::CharType kDomStorageExt[] = FILE_PATH_LITERAL(
+const base::FilePath::CharType kDomStorageExt[] = FILE_PATH_LITERAL(
"chrome-extension_abcdefghijklmnopqrstuvwxyz_0.localstorage");
const quota::StorageType kTemporary = quota::kStorageTypeTemporary;
@@ -451,7 +451,8 @@ class RemoveLocalStorageTester {
void AddDOMStorageTestData() {
// Note: This test depends on details of how the dom_storage library
// stores data in the host file system.
- FilePath storage_path = profile_->GetPath().AppendASCII("Local Storage");
+ base::FilePath storage_path =
+ profile_->GetPath().AppendASCII("Local Storage");
file_util::CreateDirectory(storage_path);
// Write some files.
44 captive_portal/captive_portal_browsertest.cc
View
@@ -416,7 +416,7 @@ net::URLRequestJob* URLRequestMockCaptivePortalJobFactory::Factory(
EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
// The PathService is threadsafe.
- FilePath root_http;
+ base::FilePath root_http;
PathService::Get(chrome::DIR_TEST_DATA, &root_http);
if (request->url() == GURL(kMockHttpsUrl) ||
@@ -1559,9 +1559,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsNonTimeoutError) {
// Make sure no captive portal test triggers on HTTPS timeouts of iframes.
IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsIframeTimeout) {
// Use an HTTPS server for the top level page.
- net::TestServer https_server(net::TestServer::TYPE_HTTPS,
- net::TestServer::kLocalhost,
- FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer https_server(
+ net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost,
+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL url = https_server.GetURL(kTestServerIframeTimeoutPath);
@@ -1614,9 +1614,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, RedirectSSLCertError) {
net::TestServer::SSLOptions ssl_options;
ssl_options.server_certificate =
net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
- net::TestServer https_server(net::TestServer::TYPE_HTTPS,
- ssl_options,
- FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer https_server(
+ net::TestServer::TYPE_HTTPS, ssl_options,
+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL ssl_login_url = https_server.GetURL(kTestServerLoginPath);
@@ -1702,9 +1702,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, SSLCertErrorLogin) {
net::TestServer::SSLOptions https_options;
https_options.server_certificate =
net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
- net::TestServer https_server(net::TestServer::TYPE_HTTPS,
- https_options,
- FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer https_server(
+ net::TestServer::TYPE_HTTPS, https_options,
+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
// The path does not matter.
@@ -1802,7 +1802,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, TwoBrokenTabs) {
ui_test_utils::NavigateToURLWithDisposition(
browser(),
URLRequestMockHTTPJob::GetMockUrl(
- FilePath(FILE_PATH_LITERAL("title2.html"))),
+ base::FilePath(FILE_PATH_LITERAL("title2.html"))),
NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
@@ -1866,9 +1866,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, NavigateBrokenTab) {
// Navigate the error tab to a non-error page.
TabStripModel* tab_strip_model = browser()->tab_strip_model();
tab_strip_model->ActivateTabAt(0, true);
- ui_test_utils::NavigateToURL(browser(),
- URLRequestMockHTTPJob::GetMockUrl(
- FilePath(FILE_PATH_LITERAL("title2.html"))));
+ ui_test_utils::NavigateToURL(
+ browser(), URLRequestMockHTTPJob::GetMockUrl(
+ base::FilePath(FILE_PATH_LITERAL("title2.html"))));
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
GetStateOfTabReloaderAt(browser(), 0));
@@ -1915,7 +1915,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
RunNavigateLoadingTabToTimeoutTest(
browser(),
URLRequestMockHTTPJob::GetMockUrl(
- FilePath(FILE_PATH_LITERAL("title.html"))),
+ base::FilePath(FILE_PATH_LITERAL("title.html"))),
GURL(kMockHttpsUrl),
GURL(kMockHttpsUrl2));
}
@@ -1926,7 +1926,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) {
ui_test_utils::NavigateToURL(
browser(),
URLRequestMockHTTPJob::GetMockUrl(
- FilePath(FILE_PATH_LITERAL("title2.html"))));
+ base::FilePath(FILE_PATH_LITERAL("title2.html"))));
// Go to the error page.
SlowLoadBehindCaptivePortal(browser(), true);
@@ -1957,9 +1957,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) {
SlowLoadNoCaptivePortal(browser(), RESULT_INTERNET_CONNECTED);
// Navigate to a working page.
- ui_test_utils::NavigateToURL(browser(),
- URLRequestMockHTTPJob::GetMockUrl(
- FilePath(FILE_PATH_LITERAL("title2.html"))));
+ ui_test_utils::NavigateToURL(
+ browser(), URLRequestMockHTTPJob::GetMockUrl(
+ base::FilePath(FILE_PATH_LITERAL("title2.html"))));
ASSERT_EQ(CaptivePortalTabReloader::STATE_NONE,
GetStateOfTabReloaderAt(browser(), 0));
@@ -2158,9 +2158,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpToHttpsRedirectLogin) {
// An HTTPS page redirects to an HTTP page.
IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsToHttpRedirect) {
// Use an HTTPS server for the top level page.
- net::TestServer https_server(net::TestServer::TYPE_HTTPS,
- net::TestServer::kLocalhost,
- FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer https_server(
+ net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost,
+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL http_timeout_url =
34 chrome_browser_main.cc
View
@@ -259,7 +259,7 @@ PrefService* InitializeLocalState(
base::SequencedTaskRunner* local_state_task_runner,
const CommandLine& parsed_command_line,
bool is_first_run) {
- FilePath local_state_path;
+ base::FilePath local_state_path;
PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
bool local_state_file_exists = file_util::PathExists(local_state_path);
@@ -297,7 +297,7 @@ PrefService* InitializeLocalState(
// to chrome_prefs::CreateLocalState.
if (!local_state_file_exists &&
parsed_command_line.HasSwitch(switches::kParentProfile)) {
- FilePath parent_profile =
+ base::FilePath parent_profile =
parsed_command_line.GetSwitchValuePath(switches::kParentProfile);
scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple();
scoped_ptr<PrefService> parent_local_state(
@@ -332,8 +332,8 @@ PrefService* InitializeLocalState(
// Returns the path that contains the profile that should be loaded
// on process startup.
-FilePath GetStartupProfilePath(const FilePath& user_data_dir,
- const CommandLine& command_line) {
+base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
+ const CommandLine& command_line) {
if (command_line.HasSwitch(switches::kProfileDirectory)) {
return user_data_dir.Append(
command_line.GetSwitchValuePath(switches::kProfileDirectory));
@@ -354,7 +354,7 @@ FilePath GetStartupProfilePath(const FilePath& user_data_dir,
// fallback profile. Returns the newly created profile, or NULL if startup
// should not continue.
Profile* CreateProfile(const content::MainFunctionParams& parameters,
- const FilePath& user_data_dir,
+ const base::FilePath& user_data_dir,
const CommandLine& parsed_command_line) {
if (ProfileManager::IsMultipleProfilesEnabled() &&
parsed_command_line.HasSwitch(switches::kProfileDirectory)) {
@@ -374,7 +374,7 @@ Profile* CreateProfile(const content::MainFunctionParams& parameters,
profile = g_browser_process->profile_manager()->GetDefaultProfile(
user_data_dir);
#else
- FilePath profile_path =
+ base::FilePath profile_path =
GetStartupProfilePath(user_data_dir, parsed_command_line);
profile = g_browser_process->profile_manager()->GetProfile(
profile_path);
@@ -391,7 +391,8 @@ Profile* CreateProfile(const content::MainFunctionParams& parameters,
// prompt the user to pick a different user-data-dir and restart chrome
// with the new dir.
// http://code.google.com/p/chromium/issues/detail?id=11510
- FilePath new_user_data_dir = chrome::ShowUserDataDirDialog(user_data_dir);
+ base::FilePath new_user_data_dir =
+ chrome::ShowUserDataDirDialog(user_data_dir);
if (!new_user_data_dir.empty()) {
// Because of the way CommandLine parses, it's sufficient to append a new
@@ -490,8 +491,9 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
cus->Start();
}
-bool ProcessSingletonNotificationCallback(const CommandLine& command_line,
- const FilePath& current_directory) {
+bool ProcessSingletonNotificationCallback(
+ const CommandLine& command_line,
+ const base::FilePath& current_directory) {
// Drop the request if the browser process is already in shutdown path.
if (!g_browser_process || g_browser_process->IsShuttingDown())
return false;
@@ -519,9 +521,9 @@ bool ProcessSingletonNotificationCallback(const CommandLine& command_line,
return true;
}
- FilePath user_data_dir =
+ base::FilePath user_data_dir =
g_browser_process->profile_manager()->user_data_dir();
- FilePath startup_profile_dir =
+ base::FilePath startup_profile_dir =
GetStartupProfilePath(user_data_dir, command_line);
StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
@@ -829,7 +831,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
!ProfileManager::IsImportProcess(parsed_command_line());
#endif
- 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,
@@ -910,7 +912,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
browser_process_->SetApplicationLocale(loaded_locale);
- FilePath resources_pack_path;
+ base::FilePath resources_pack_path;
PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
ResourceBundle::GetSharedInstance().AddDataPackFromPath(
resources_pack_path, ui::SCALE_FACTOR_NONE);
@@ -1062,7 +1064,7 @@ void ChromeBrowserMainParts::RunPageCycler() {
profile_, chrome::HOST_DESKTOP_TYPE_NATIVE);
DCHECK(browser);
PageCycler* page_cycler = NULL;
- FilePath input_file =
+ base::FilePath input_file =
command_line->GetSwitchValuePath(switches::kVisitURLs);
page_cycler = new PageCycler(browser, input_file);
page_cycler->set_errors_file(
@@ -1420,7 +1422,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
if (parsed_command_line().HasSwitch(switches::kDebugPrint)) {
- FilePath path =
+ base::FilePath path =
parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
printing::PrintedDocument::set_debug_dump_path(path);
}
@@ -1517,7 +1519,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate))
RegisterComponentsForUpdate(parsed_command_line());
- if (browser_creator_->Start(parsed_command_line(), FilePath(),
+ if (browser_creator_->Start(parsed_command_line(), base::FilePath(),
profile_, last_opened_profiles, &result_code)) {
#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
// Initialize autoupdate timer. Timer callback costs basically nothing
2  chrome_browser_main.h
View
@@ -183,7 +183,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
// PreMainMessageLoopRunThreadsCreated.
bool do_first_run_tasks_;
PrefService* local_state_;
- FilePath user_data_dir_;
+ base::FilePath user_data_dir_;
// Members needed across shutdown methods.
bool restart_last_session_;