diff options
Diffstat (limited to 'content')
24 files changed, 24 insertions, 23 deletions
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index cadd31c..6a6a8b6 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -19,7 +19,7 @@ #include "content/public/common/bindings_policy.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/url_request/url_request.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_permission_policy.h" diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 94cead5..80ab95e 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -18,8 +18,8 @@ #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_thread.h" +#include "net/base/filename_util.h" #include "net/base/io_buffer.h" -#include "net/base/net_util.h" #include "url/gurl.h" namespace content { diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index ae41845..b60c354 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -39,9 +39,9 @@ #include "content/public/browser/resource_context.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "net/base/filename_util.h" #include "net/base/io_buffer.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/public/web/WebPageSerializerClient.h" diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index b26d355..adf338e 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -19,7 +19,7 @@ #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "net/base/host_port_pair.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace content { diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index e40e973..6bac34d 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -72,6 +72,7 @@ #include "content/public/common/result_codes.h" #include "content/public/common/url_constants.h" #include "content/public/common/url_utils.h" +#include "net/base/filename_util.h" #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context_getter.h" diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 40a1fb6..cb5e52b 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -18,7 +18,7 @@ #include "content/test/test_content_browser_client.h" #include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "third_party/WebKit/public/web/WebDragOperation.h" namespace content { diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc index 47e5981..3e3f77d 100644 --- a/content/browser/renderer_host/render_widget_host_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_browsertest.cc @@ -10,7 +10,7 @@ #include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "third_party/skia/include/core/SkBitmap.h" namespace content { diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 65f6536..7101e9d 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -24,7 +24,7 @@ #include "content/shell/browser/shell.h" #include "media/base/video_frame.h" #include "media/filters/skcanvas_video_renderer.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/base/ui_base_switches.h" diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index b23bc5d..67ee957 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -41,7 +41,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/drop_data.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_tree_client.h" diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index 463db3e..9741b44c 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -27,8 +27,8 @@ #include "content/public/common/url_constants.h" #include "grit/ui_resources.h" #include "net/base/escape.h" +#include "net/base/filename_util.h" #include "net/base/mime_util.h" -#include "net/base/net_util.h" #include "ui/base/clipboard/custom_data_helper.h" #include "ui/base/dragdrop/cocoa_dnd_util.h" #include "ui/gfx/image/image.h" diff --git a/content/child/npapi/plugin_host.cc b/content/child/npapi/plugin_host.cc index 18cea3b..39c6257 100644 --- a/content/child/npapi/plugin_host.cc +++ b/content/child/npapi/plugin_host.cc @@ -21,7 +21,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/user_agent.h" #include "content/public/common/webplugininfo.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "third_party/WebKit/public/web/WebBindings.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/npapi/bindings/npruntime.h" diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc index ac0ad990..7724a50e 100644 --- a/content/child/web_url_loader_impl.cc +++ b/content/child/web_url_loader_impl.cc @@ -20,10 +20,10 @@ #include "content/common/resource_request_body.h" #include "content/public/child/request_peer.h" #include "net/base/data_url.h" +#include "net/base/filename_util.h" #include "net/base/load_flags.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" diff --git a/content/child/webfileutilities_impl.cc b/content/child/webfileutilities_impl.cc index 5188e51..e2f3e33 100644 --- a/content/child/webfileutilities_impl.cc +++ b/content/child/webfileutilities_impl.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "content/child/blink_glue.h" #include "net/base/file_stream.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index 9ddd8de..d81f391 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc @@ -26,7 +26,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/test/test_utils.h" #include "grit/webui_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/cookies/cookie_store.h" #include "net/test/python_utils.h" #include "net/url_request/url_request_context.h" diff --git a/content/public/test/content_browser_test_utils.cc b/content/public/test/content_browser_test_utils.cc index 44e5089..c2de314 100644 --- a/content/public/test/content_browser_test_utils.cc +++ b/content/public/test/content_browser_test_utils.cc @@ -17,7 +17,7 @@ #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_javascript_dialog_manager.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" namespace content { diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 7ecb34c..7fd4369 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -18,7 +18,7 @@ #include "content/public/test/test_utils.h" #include "content/renderer/savable_resources.h" #include "content/shell/browser/shell.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebData.h" diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index 344dbe4..b80c8af 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc @@ -12,7 +12,7 @@ #include "content/public/test/content_browser_test_utils.h" #include "content/renderer/savable_resources.h" #include "content/shell/browser/shell.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" namespace content { diff --git a/content/shell/browser/shell_browser_main.cc b/content/shell/browser/shell_browser_main.cc index 6e891320..9fef476 100644 --- a/content/shell/browser/shell_browser_main.cc +++ b/content/shell/browser/shell_browser_main.cc @@ -22,7 +22,7 @@ #include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #if defined(OS_ANDROID) #include "base/run_loop.h" diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc index a0748b2..a15bb56 100644 --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc @@ -23,8 +23,8 @@ #include "content/shell/browser/shell_net_log.h" #include "content/shell/common/shell_switches.h" #include "grit/net_resources.h" +#include "net/base/filename_util.h" #include "net/base/net_module.h" -#include "net/base/net_util.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" #include "webkit/browser/quota/quota_manager.h" diff --git a/content/shell/browser/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc index 93f1a3a..c33a25b 100644 --- a/content/shell/browser/shell_devtools_frontend.cc +++ b/content/shell/browser/shell_devtools_frontend.cc @@ -21,7 +21,7 @@ #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/browser/shell_devtools_delegate.h" #include "content/shell/common/shell_switches.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" namespace content { diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc index bd5a294..7c47ade 100644 --- a/content/shell/browser/shell_download_manager_delegate.cc +++ b/content/shell/browser/shell_download_manager_delegate.cc @@ -26,7 +26,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #if defined(OS_WIN) #include "ui/aura/window.h" diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index c837a8f..826d47a 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -36,8 +36,8 @@ #include "content/shell/renderer/test_runner/WebTestInterfaces.h" #include "content/shell/renderer/test_runner/WebTestProxy.h" #include "content/shell/renderer/test_runner/WebTestRunner.h" +#include "net/base/filename_util.h" #include "net/base/net_errors.h" -#include "net/base/net_util.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/platform/WebCString.h" diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc index 4c7c0a9..f6bf8fb 100644 --- a/content/test/net/url_request_mock_http_job.cc +++ b/content/test/net/url_request_mock_http_job.cc @@ -12,7 +12,7 @@ #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_filter.h" diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc index 011b141..70cd850 100644 --- a/content/test/webui_resource_browsertest.cc +++ b/content/test/webui_resource_browsertest.cc @@ -13,7 +13,7 @@ #include "content/shell/browser/shell.h" #include "grit/content_resources.h" #include "grit/webui_resources.h" -#include "net/base/net_util.h" +#include "net/base/filename_util.h" namespace content { |