diff options
Diffstat (limited to 'chrome')
30 files changed, 33 insertions, 28 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 70b0707..82fe1c3 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -86,7 +86,7 @@ #include "extensions/browser/extension_system.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/cocoa/focus_window_set.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc index a63b828..766203a 100644 --- a/chrome/browser/chrome_main_browsertest.cc +++ b/chrome/browser/chrome_main_browsertest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" // These tests don't apply to the Mac version; see GetCommandLineForRelaunch // for details. diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc index 06ea31e..290b36f 100644 --- a/chrome/browser/chrome_plugin_browsertest.cc +++ b/chrome/browser/chrome_plugin_browsertest.cc @@ -31,7 +31,7 @@ #include "content/public/common/webplugininfo.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #if defined(OS_WIN) #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc index c387cdd..8dcf400 100644 --- a/chrome/browser/chromeos/drive/file_cache.cc +++ b/chrome/browser/chromeos/drive/file_cache.cc @@ -21,9 +21,9 @@ #include "chromeos/chromeos_constants.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/task_util.h" +#include "net/base/filename_util.h" #include "net/base/mime_sniffer.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #include "third_party/cros_system_api/constants/cryptohome.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/file_manager/open_with_browser.cc b/chrome/browser/chromeos/file_manager/open_with_browser.cc index 0750742..0a3bb52 100644 --- a/chrome/browser/chromeos/file_manager/open_with_browser.cc +++ b/chrome/browser/chromeos/file_manager/open_with_browser.cc @@ -23,7 +23,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" using content::BrowserThread; using content::PluginService; diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 4ff4ebf..f197663 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -49,8 +49,8 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/page_navigator.h" #include "extensions/common/constants.h" +#include "net/base/filename_util.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/drive/download_handler.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 0d32ace..c4de117 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -86,7 +86,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index 0ddb3a0..7d2f2c5 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -23,8 +23,8 @@ #include "extensions/common/constants.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" +#include "net/base/filename_util.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #if defined(ENABLE_PLUGINS) diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 209ffb3..7342c694 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -72,8 +72,8 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" +#include "net/base/filename_util.h" #include "net/base/load_flags.h" -#include "net/base/net_util.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/api/execute_code_function.cc b/chrome/browser/extensions/api/execute_code_function.cc index 9a7ec7d..39427fc 100644 --- a/chrome/browser/extensions/api/execute_code_function.cc +++ b/chrome/browser/extensions/api/execute_code_function.cc @@ -13,7 +13,7 @@ #include "extensions/browser/file_reader.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension_messages.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/resource/resource_bundle.h" namespace extensions { diff --git a/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h b/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h index 39be4fe..e31accf 100644 --- a/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h +++ b/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h @@ -15,6 +15,10 @@ class Profile; class ProfileSyncServiceHarness; +namespace base { +class FilePath; +} + namespace extensions { class SyncSetupHelper { diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc index c4b3deb..c78dae6 100644 --- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc +++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc @@ -11,7 +11,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" class CalculatorBrowserTest : public InProcessBrowserTest { }; diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 8de65ee..f388524 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -21,7 +21,7 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "net/base/escape.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 459de6e..16c949e 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -34,7 +34,7 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" using extensions::FeatureSwitch; diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 520ee7b..21170d8 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -20,7 +20,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" using content::NavigationController; using content::WebContents; diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index 342ac0b..4089392 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -28,7 +28,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/events/event_constants.h" diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 56caccc..666afae 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -22,7 +22,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index b4ef1c2..31bd25f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -181,7 +181,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm index 3278b3a..7dff793 100644 --- a/chrome/browser/ui/cocoa/drag_util.mm +++ b/chrome/browser/ui/cocoa/drag_util.mm @@ -10,8 +10,8 @@ #include "content/public/common/url_constants.h" #include "content/public/common/webplugininfo.h" #include "ipc/ipc_message.h" +#include "net/base/filename_util.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #import "third_party/mozilla/NSPasteboard+Utils.h" #import "ui/base/dragdrop/cocoa_dnd_util.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 984829e..ff66240 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -38,7 +38,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 84de5c6..04bceeb 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -39,7 +39,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/webplugininfo.h" #include "ipc/ipc_message.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/layout.h" #include "ui/base/models/list_selection_model.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index d1c97fa..9c471ec 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -52,8 +52,8 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/escape.h" +#include "net/base/filename_util.h" #include "net/base/load_flags.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 3c982fc..bfea475 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -47,7 +47,7 @@ #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/l10n/time_format.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.cc b/chrome/browser/ui/webui/extensions/install_extension_handler.cc index a87d439..d503e65 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.cc +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.cc @@ -20,7 +20,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/common/net/url_fixer_upper.cc b/chrome/common/net/url_fixer_upper.cc index 5c72023..37b4d68 100644 --- a/chrome/common/net/url_fixer_upper.cc +++ b/chrome/common/net/url_fixer_upper.cc @@ -15,6 +15,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "net/base/escape.h" +#include "net/base/filename_util.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "url/url_file.h" diff --git a/chrome/common/net/url_fixer_upper_unittest.cc b/chrome/common/net/url_fixer_upper_unittest.cc index a6d4cce..a6e80c6 100644 --- a/chrome/common/net/url_fixer_upper_unittest.cc +++ b/chrome/common/net/url_fixer_upper_unittest.cc @@ -11,7 +11,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/net/url_fixer_upper.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "url/url_parse.h" diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 5885fe7..3ca5ff4 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -70,7 +70,7 @@ #include "content/public/test/download_test_observer.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/cookies/cookie_constants.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" diff --git a/chrome/test/base/web_ui_browsertest.cc b/chrome/test/base/web_ui_browsertest.cc index 81f54c6..36e5557 100644 --- a/chrome/test/base/web_ui_browsertest.cc +++ b/chrome/test/base/web_ui_browsertest.cc @@ -38,7 +38,7 @@ #include "content/public/browser/web_ui_message_handler.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest-spi.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 9b575bc..6cc7f9c 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -22,7 +22,7 @@ #include "gpu/config/gpu_feature_type.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_test_config.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "ui/gl/gl_implementation.h" #if defined(OS_MACOSX) diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc index 4d163b1..99d233d 100644 --- a/chrome/test/ppapi/ppapi_test.cc +++ b/chrome/test/ppapi/ppapi_test.cc @@ -26,7 +26,7 @@ #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/base/test_data_directory.h" #include "ppapi/shared_impl/ppapi_switches.h" #include "ui/gl/gl_switches.h" |