Move network-related code to net/ folder

cef.gyp

@@ -975,8 +975,8 @@
         'libcef/browser/chrome_browser_process_stub.h',
         'libcef/browser/chrome_profile_stub.cc',
         'libcef/browser/chrome_profile_stub.h',
-        'libcef/browser/chrome_scheme_handler.cc',
+        'libcef/browser/component_updater/cef_component_updater_configurator.cc',
-        'libcef/browser/chrome_scheme_handler.h',
+        'libcef/browser/component_updater/cef_component_updater_configurator.h',
         'libcef/browser/content_browser_client.cc',
         'libcef/browser/content_browser_client.h',
         'libcef/browser/context.cc',
@@ -985,20 +985,14 @@
         'libcef/browser/context_menu_params_impl.h',
         'libcef/browser/cookie_manager_impl.cc',
         'libcef/browser/cookie_manager_impl.h',
-        'libcef/browser/cookie_store_proxy.cc',
-        'libcef/browser/cookie_store_proxy.h',
         'libcef/browser/devtools_delegate.cc',
         'libcef/browser/devtools_delegate.h',
         'libcef/browser/devtools_frontend.cc',
         'libcef/browser/devtools_frontend.h',
-        'libcef/browser/devtools_scheme_handler.cc',
-        'libcef/browser/devtools_scheme_handler.h',
         'libcef/browser/download_item_impl.cc',
         'libcef/browser/download_item_impl.h',
         'libcef/browser/download_manager_delegate.cc',
         'libcef/browser/download_manager_delegate.h',
-        'libcef/browser/component_updater/cef_component_updater_configurator.cc',
-        'libcef/browser/component_updater/cef_component_updater_configurator.h',
         'libcef/browser/extensions/api/streams_private/streams_private_api.cc',
         'libcef/browser/extensions/api/streams_private/streams_private_api.h',
         'libcef/browser/extensions/browser_context_keyed_service_factories.cc',
@@ -1033,8 +1027,6 @@
         'libcef/browser/frame_host_impl.cc',
         'libcef/browser/frame_host_impl.h',
         'libcef/browser/geolocation_impl.cc',
-        'libcef/browser/internal_scheme_handler.cc',
-        'libcef/browser/internal_scheme_handler.h',
         'libcef/browser/javascript_dialog_runner.h',
         'libcef/browser/javascript_dialog_manager.cc',
         'libcef/browser/javascript_dialog_manager.h',
@@ -1051,6 +1043,36 @@
         'libcef/browser/navigate_params.h',
         'libcef/browser/navigation_entry_impl.cc',
         'libcef/browser/navigation_entry_impl.h',
+        'libcef/browser/net/chrome_scheme_handler.cc',
+        'libcef/browser/net/chrome_scheme_handler.h',
+        'libcef/browser/net/cookie_store_proxy.cc',
+        'libcef/browser/net/cookie_store_proxy.h',
+        'libcef/browser/net/devtools_scheme_handler.cc',
+        'libcef/browser/net/devtools_scheme_handler.h',
+        'libcef/browser/net/internal_scheme_handler.cc',
+        'libcef/browser/net/internal_scheme_handler.h',
+        'libcef/browser/net/network_delegate.cc',
+        'libcef/browser/net/network_delegate.h',
+        'libcef/browser/net/resource_request_job.cc',
+        'libcef/browser/net/resource_request_job.h',
+        'libcef/browser/net/scheme_handler.cc',
+        'libcef/browser/net/scheme_handler.h',
+        'libcef/browser/net/url_request_context.cc',
+        'libcef/browser/net/url_request_context.h',
+        'libcef/browser/net/url_request_context_getter.h',
+        'libcef/browser/net/url_request_context_getter_impl.cc',
+        'libcef/browser/net/url_request_context_getter_impl.h',
+        'libcef/browser/net/url_request_context_getter_proxy.cc',
+        'libcef/browser/net/url_request_context_getter_proxy.h',
+        'libcef/browser/net/url_request_context_impl.h',
+        'libcef/browser/net/url_request_context_proxy.cc',
+        'libcef/browser/net/url_request_context_proxy.h',
+        'libcef/browser/net/url_request_interceptor.cc',
+        'libcef/browser/net/url_request_interceptor.h',
+        'libcef/browser/net/url_request_manager.cc',
+        'libcef/browser/net/url_request_manager.h',
+        'libcef/browser/net/url_request_user_data.cc',
+        'libcef/browser/net/url_request_user_data.h',
         'libcef/browser/origin_whitelist_impl.cc',
         'libcef/browser/origin_whitelist_impl.h',
         'libcef/browser/osr/browser_platform_delegate_osr.cc',
@@ -1099,12 +1121,8 @@
         'libcef/browser/resource_context.h',
         'libcef/browser/resource_dispatcher_host_delegate.cc',
         'libcef/browser/resource_dispatcher_host_delegate.h',
-        'libcef/browser/resource_request_job.cc',
-        'libcef/browser/resource_request_job.h',
         'libcef/browser/request_context_impl.cc',
         'libcef/browser/request_context_impl.h',
-        'libcef/browser/scheme_handler.cc',
-        'libcef/browser/scheme_handler.h',
         'libcef/browser/scheme_impl.cc',
         'libcef/browser/speech_recognition_manager_delegate.cc',
         'libcef/browser/speech_recognition_manager_delegate.h',
@@ -1120,24 +1138,6 @@
         'libcef/browser/trace_subscriber.cc',
         'libcef/browser/trace_subscriber.h',
         'libcef/browser/thread_util.h',
-        'libcef/browser/url_network_delegate.cc',
-        'libcef/browser/url_network_delegate.h',
-        'libcef/browser/url_request_context.cc',
-        'libcef/browser/url_request_context.h',
-        'libcef/browser/url_request_context_getter.h',
-        'libcef/browser/url_request_context_getter_impl.cc',
-        'libcef/browser/url_request_context_getter_impl.h',
-        'libcef/browser/url_request_context_getter_proxy.cc',
-        'libcef/browser/url_request_context_getter_proxy.h',
-        'libcef/browser/url_request_context_impl.h',
-        'libcef/browser/url_request_context_proxy.cc',
-        'libcef/browser/url_request_context_proxy.h',
-        'libcef/browser/url_request_manager.cc',
-        'libcef/browser/url_request_manager.h',
-        'libcef/browser/url_request_interceptor.cc',
-        'libcef/browser/url_request_interceptor.h',
-        'libcef/browser/url_request_user_data.cc',
-        'libcef/browser/url_request_user_data.h',
         'libcef/browser/web_plugin_impl.cc',
         'libcef/browser/web_plugin_impl.h',
         'libcef/browser/xml_reader_impl.cc',
@@ -1163,13 +1163,19 @@
         'libcef/common/extensions/extensions_client.h',
         'libcef/common/extensions/extensions_util.cc',
         'libcef/common/extensions/extensions_util.h',
-        'libcef/common/http_header_utils.cc',
-        'libcef/common/http_header_utils.h',
         'libcef/common/json_impl.cc',
         'libcef/common/main_delegate.cc',
         'libcef/common/main_delegate.h',
-        'libcef/common/net_resource_provider.cc',
+        'libcef/common/net/http_header_utils.cc',
-        'libcef/common/net_resource_provider.h',
+        'libcef/common/net/http_header_utils.h',
+        'libcef/common/net/net_resource_provider.cc',
+        'libcef/common/net/net_resource_provider.h',
+        'libcef/common/net/scheme_registration.cc',
+        'libcef/common/net/scheme_registration.h',
+        'libcef/common/net/upload_data.cc',
+        'libcef/common/net/upload_data.h',
+        'libcef/common/net/upload_element.cc',
+        'libcef/common/net/upload_element.h',
         'libcef/common/parser_impl.cc',
         'libcef/common/process_message_impl.cc',
         'libcef/common/process_message_impl.h',
@@ -1183,8 +1189,6 @@
         'libcef/common/response_manager.h',
         'libcef/common/scheme_registrar_impl.cc',
         'libcef/common/scheme_registrar_impl.h',
-        'libcef/common/scheme_registration.cc',
-        'libcef/common/scheme_registration.h',
         'libcef/common/string_list_impl.cc',
         'libcef/common/string_map_impl.cc',
         'libcef/common/string_multimap_impl.cc',
@@ -1202,10 +1206,6 @@
         'libcef/common/value_base.h',
         'libcef/common/values_impl.cc',
         'libcef/common/values_impl.h',
-        'libcef/common/upload_data.cc',
-        'libcef/common/upload_data.h',
-        'libcef/common/upload_element.cc',
-        'libcef/common/upload_element.h',
         'libcef/renderer/browser_impl.cc',
         'libcef/renderer/browser_impl.h',
         'libcef/renderer/content_renderer_client.cc',

libcef/browser/browser_context.h

@@ -8,8 +8,8 @@
 
 #include "include/cef_request_context_handler.h"
 #include "libcef/browser/chrome_profile_stub.h"
+#include "libcef/browser/net/url_request_context_getter_impl.h"
 #include "libcef/browser/resource_context.h"
-#include "libcef/browser/url_request_context_getter_impl.h"
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"

libcef/browser/browser_context_impl.h

@@ -8,7 +8,7 @@
 
 #include "libcef/browser/browser_context.h"
 
-#include "libcef/browser/url_request_context_getter_impl.h"
+#include "libcef/browser/net/url_request_context_getter_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"

libcef/browser/browser_context_proxy.cc

@@ -6,8 +6,8 @@
 
 #include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/download_manager_delegate.h"
+#include "libcef/browser/net/url_request_context_getter_proxy.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_request_context_getter_proxy.h"
 
 #include "base/logging.h"
 #include "chrome/browser/font_family_cache.h"

libcef/browser/browser_host_impl.cc

@@ -11,7 +11,6 @@
 #include "libcef/browser/browser_context_impl.h"
 #include "libcef/browser/browser_info.h"
 #include "libcef/browser/browser_info_manager.h"
-#include "libcef/browser/chrome_scheme_handler.h"
 #include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/devtools_delegate.h"
@@ -20,17 +19,18 @@
 #include "libcef/browser/media_capture_devices_dispatcher.h"
 #include "libcef/browser/navigate_params.h"
 #include "libcef/browser/navigation_entry_impl.h"
+#include "libcef/browser/net/chrome_scheme_handler.h"
+#include "libcef/browser/net/scheme_handler.h"
 #include "libcef/browser/osr/osr_util.h"
 #include "libcef/browser/printing/print_view_manager.h"
 #include "libcef/browser/request_context_impl.h"
-#include "libcef/browser/scheme_handler.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/cef_messages.h"
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/drag_data_impl.h"
 #include "libcef/common/extensions/extensions_util.h"
-#include "libcef/common/http_header_utils.h"
 #include "libcef/common/main_delegate.h"
+#include "libcef/common/net/http_header_utils.h"
 #include "libcef/common/process_message_impl.h"
 #include "libcef/common/request_impl.h"
 

libcef/browser/browser_main.cc

@@ -18,7 +18,7 @@
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/extensions/extensions_client.h"
 #include "libcef/common/extensions/extensions_util.h"
-#include "libcef/common/net_resource_provider.h"
+#include "libcef/common/net/net_resource_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"

libcef/browser/browser_main.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "libcef/browser/browser_context_impl.h"
-#include "libcef/browser/url_request_context_getter_impl.h"
+#include "libcef/browser/net/url_request_context_getter_impl.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"

libcef/browser/browser_urlrequest_impl.cc

@@ -8,10 +8,10 @@
 
 #include "libcef/browser/browser_context.h"
 #include "libcef/browser/content_browser_client.h"
+#include "libcef/browser/net/url_request_user_data.h"
 #include "libcef/browser/request_context_impl.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_request_user_data.h"
+#include "libcef/common/net/http_header_utils.h"
-#include "libcef/common/http_header_utils.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/common/response_impl.h"
 

libcef/browser/content_browser_client.cc

@@ -12,11 +12,11 @@
 #include "libcef/browser/browser_main.h"
 #include "libcef/browser/browser_message_filter.h"
 #include "libcef/browser/browser_platform_delegate.h"
-#include "libcef/browser/chrome_scheme_handler.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/devtools_delegate.h"
 #include "libcef/browser/extensions/extension_system.h"
 #include "libcef/browser/media_capture_devices_dispatcher.h"
+#include "libcef/browser/net/chrome_scheme_handler.h"
 #include "libcef/browser/pepper/browser_pepper_host_factory.h"
 #include "libcef/browser/plugins/plugin_info_message_filter.h"
 #include "libcef/browser/plugins/plugin_service_filter.h"
@@ -31,8 +31,8 @@
 #include "libcef/common/command_line_impl.h"
 #include "libcef/common/content_client.h"
 #include "libcef/common/extensions/extensions_util.h"
+#include "libcef/common/net/scheme_registration.h"
 #include "libcef/common/request_impl.h"
-#include "libcef/common/scheme_registration.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"

libcef/browser/content_browser_client.h

@@ -11,7 +11,7 @@
 
 #include "include/cef_request_context_handler.h"
 #include "libcef/browser/browser_context_impl.h"
-#include "libcef/browser/url_request_context_getter_impl.h"
+#include "libcef/browser/net/url_request_context_getter_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"

libcef/browser/devtools_delegate.cc

@@ -3,7 +3,7 @@
 // governed by a BSD-style license that can be found in the LICENSE file.
 
 #include "libcef/browser/devtools_delegate.h"
-#include "libcef/browser/devtools_scheme_handler.h"
+#include "libcef/browser/net/devtools_scheme_handler.h"
 #include "libcef/common/content_client.h"
 
 #include <algorithm>

libcef/browser/navigate_params.h

@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "libcef/common/upload_data.h"
+#include "libcef/common/net/upload_data.h"
 
 #include "content/public/browser/global_request_id.h"
 #include "content/public/common/referrer.h"

libcef/browser/net/chrome_scheme_handler.cc

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/chrome_scheme_handler.h"
+#include "libcef/browser/net/chrome_scheme_handler.h"
 
 #include <map>
 #include <string>
@@ -11,8 +11,8 @@
 #include "include/cef_version.h"
 #include "include/cef_web_plugin.h"
 #include "libcef/browser/frame_host_impl.h"
-#include "libcef/browser/internal_scheme_handler.h"
+#include "libcef/browser/net/internal_scheme_handler.h"
-#include "libcef/browser/url_request_manager.h"
+#include "libcef/browser/net/url_request_manager.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/content_client.h"
 

libcef/browser/net/chrome_scheme_handler.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_CHROME_SCHEME_HANDLER_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_CHROME_SCHEME_HANDLER_H_
-#define CEF_LIBCEF_BROWSER_CHROME_SCHEME_HANDLER_H_
+#define CEF_LIBCEF_BROWSER_NET_CHROME_SCHEME_HANDLER_H_
 #pragma once
 
 #include <string>

libcef/browser/net/cookie_store_proxy.cc

@@ -2,10 +2,11 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#include "libcef/browser/cookie_store_proxy.h"
+#include "libcef/browser/net/cookie_store_proxy.h"
+
 #include "libcef/browser/cookie_manager_impl.h"
+#include "libcef/browser/net/url_request_context_impl.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_request_context_impl.h"
 
 #include "base/logging.h"
 #include "net/url_request/url_request_context.h"

libcef/browser/net/devtools_scheme_handler.cc

@@ -2,12 +2,12 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#include "libcef/browser/devtools_scheme_handler.h"
+#include "libcef/browser/net/devtools_scheme_handler.h"
 
 #include <string>
 
-#include "libcef/browser/internal_scheme_handler.h"
+#include "libcef/browser/net/internal_scheme_handler.h"
-#include "libcef/browser/url_request_manager.h"
+#include "libcef/browser/net/url_request_manager.h"
 
 #include "base/strings/string_util.h"
 #include "content/public/common/url_constants.h"

libcef/browser/net/devtools_scheme_handler.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_DEVTOOLS_SCHEME_HANDLER_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_DEVTOOLS_SCHEME_HANDLER_H_
-#define CEF_LIBCEF_BROWSER_DEVTOOLS_SCHEME_HANDLER_H_
+#define CEF_LIBCEF_BROWSER_NET_DEVTOOLS_SCHEME_HANDLER_H_
 #pragma once
 
 class CefURLRequestManager;
@@ -17,4 +17,4 @@ void RegisterChromeDevToolsHandler(CefURLRequestManager* request_manager);
 
 }  // namespace scheme
 
-#endif  // CEF_LIBCEF_BROWSER_DEVTOOLS_SCHEME_HANDLER_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_DEVTOOLS_SCHEME_HANDLER_H_

libcef/browser/net/internal_scheme_handler.cc

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/internal_scheme_handler.h"
+#include "libcef/browser/net/internal_scheme_handler.h"
 
 #include <string>
 

libcef/browser/net/internal_scheme_handler.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_INTERNAL_SCHEME_HANDLER_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_INTERNAL_SCHEME_HANDLER_H_
-#define CEF_LIBCEF_BROWSER_INTERNAL_SCHEME_HANDLER_H_
+#define CEF_LIBCEF_BROWSER_NET_INTERNAL_SCHEME_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -51,4 +51,4 @@ CefRefPtr<CefSchemeHandlerFactory> CreateInternalHandlerFactory(
 
 }  // namespace scheme
 
-#endif  // CEF_LIBCEF_BROWSER_INTERNAL_SCHEME_HANDLER_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_INTERNAL_SCHEME_HANDLER_H_

libcef/browser/net/network_delegate.cc

@@ -2,14 +2,14 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#include "libcef/browser/url_network_delegate.h"
+#include "libcef/browser/net/network_delegate.h"
 
 #include <string>
 
 #include "include/cef_urlrequest.h"
 #include "libcef/browser/browser_host_impl.h"
+#include "libcef/browser/net/url_request_user_data.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_request_user_data.h"
 #include "libcef/common/request_impl.h"
 
 #include "net/base/net_errors.h"

libcef/browser/net/network_delegate.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_NETWORK_DELEGATE_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_NETWORK_DELEGATE_H_
-#define CEF_LIBCEF_BROWSER_URL_NETWORK_DELEGATE_H_
+#define CEF_LIBCEF_BROWSER_NET_NETWORK_DELEGATE_H_
 #pragma once
 
 #include "net/base/network_delegate_impl.h"
@@ -31,4 +31,4 @@ class CefNetworkDelegate : public net::NetworkDelegateImpl {
   DISALLOW_COPY_AND_ASSIGN(CefNetworkDelegate);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_NETWORK_DELEGATE_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_NETWORK_DELEGATE_H_

libcef/browser/net/resource_request_job.cc

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/resource_request_job.h"
+#include "libcef/browser/net/resource_request_job.h"
 
 #include <map>
 #include <vector>

libcef/browser/net/scheme_handler.cc

@@ -2,13 +2,13 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "libcef/browser/scheme_handler.h"
+#include "libcef/browser/net/scheme_handler.h"
 
 #include <string>
 
-#include "libcef/browser/chrome_scheme_handler.h"
+#include "libcef/browser/net/chrome_scheme_handler.h"
-#include "libcef/browser/devtools_scheme_handler.h"
+#include "libcef/browser/net/devtools_scheme_handler.h"
-#include "libcef/common/scheme_registration.h"
+#include "libcef/common/net/scheme_registration.h"
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/browser_thread.h"

libcef/browser/net/scheme_handler.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_SCHEME_HANDLER_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_SCHEME_HANDLER_H_
-#define CEF_LIBCEF_BROWSER_SCHEME_HANDLER_H_
+#define CEF_LIBCEF_BROWSER_NET_SCHEME_HANDLER_H_
 #pragma once
 
 #include "include/cef_frame.h"
@@ -36,4 +36,4 @@ void DidFinishLoad(CefRefPtr<CefFrame> frame, const GURL& validated_url);
 
 }  // namespace scheme
 
-#endif  // CEF_LIBCEF_BROWSER_SCHEME_HANDLER_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_SCHEME_HANDLER_H_

libcef/browser/net/url_request_context.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/url_request_context.h"
+#include "libcef/browser/net/url_request_context.h"
 
 #ifndef NDEBUG
 base::AtomicRefCount CefURLRequestContext::DebugObjCt = 0;

libcef/browser/net/url_request_context.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_H_
 #pragma once
 
 #include "net/url_request/url_request_context.h"
@@ -27,4 +27,4 @@ class CefURLRequestContext : public net::URLRequestContext {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestContext);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_H_

libcef/browser/net/url_request_context_getter.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
 #pragma once
 
 #include "net/url_request/url_request_context_getter.h"
@@ -27,4 +27,4 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestContextGetter);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_

libcef/browser/net/url_request_context_getter_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/url_request_context_getter_impl.h"
+#include "libcef/browser/net/url_request_context_getter_impl.h"
 
 #if defined(OS_WIN)
 #include <winhttp.h>
@@ -11,10 +11,10 @@
 #include <vector>
 
 #include "libcef/browser/cookie_manager_impl.h"
-#include "libcef/browser/scheme_handler.h"
+#include "libcef/browser/net/network_delegate.h"
+#include "libcef/browser/net/scheme_handler.h"
+#include "libcef/browser/net/url_request_interceptor.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_network_delegate.h"
-#include "libcef/browser/url_request_interceptor.h"
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/content_client.h"
 

libcef/browser/net/url_request_context_getter_impl.h

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_IMPL_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_IMPL_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_IMPL_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_IMPL_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "include/internal/cef_types_wrappers.h"
-#include "libcef/browser/url_request_context_getter.h"
+#include "libcef/browser/net/url_request_context_getter.h"
-#include "libcef/browser/url_request_context_impl.h"
+#include "libcef/browser/net/url_request_context_impl.h"
-#include "libcef/browser/url_request_manager.h"
+#include "libcef/browser/net/url_request_manager.h"
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ -97,4 +97,4 @@ class CefURLRequestContextGetterImpl : public CefURLRequestContextGetter {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestContextGetterImpl);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_IMPL_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_IMPL_H_

libcef/browser/net/url_request_context_getter_proxy.cc

@@ -2,10 +2,11 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#include "libcef/browser/url_request_context_getter_proxy.h"
+#include "libcef/browser/net/url_request_context_getter_proxy.h"
+
+#include "libcef/browser/net/url_request_context_getter.h"
+#include "libcef/browser/net/url_request_context_proxy.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_request_context_getter.h"
-#include "libcef/browser/url_request_context_proxy.h"
 
 CefURLRequestContextGetterProxy::CefURLRequestContextGetterProxy(
     CefRefPtr<CefRequestContextHandler> handler,

libcef/browser/net/url_request_context_getter_proxy.h

@@ -2,13 +2,13 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_PROXY_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_PROXY_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_PROXY_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_PROXY_H_
 #pragma once
 
 #include "include/cef_request_context_handler.h"
-#include "libcef/browser/url_request_context_getter.h"
+#include "libcef/browser/net/url_request_context_getter.h"
-#include "libcef/browser/url_request_context_getter_impl.h"
+#include "libcef/browser/net/url_request_context_getter_impl.h"
 
 #include "base/memory/scoped_ptr.h"
 
@@ -48,4 +48,4 @@ class CefURLRequestContextGetterProxy : public CefURLRequestContextGetter {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestContextGetterProxy);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_GETTER_PROXY_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_PROXY_H_

libcef/browser/net/url_request_context_impl.h

@@ -2,11 +2,11 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_IMPL_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_IMPL_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_IMPL_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_IMPL_H_
 #pragma once
 
-#include "libcef/browser/url_request_context.h"
+#include "libcef/browser/net/url_request_context.h"
 
 // Isolated URLRequestContext implementation. Life span is controlled by
 // CefURLRequestContextGetterImpl. Only accessed on the IO thread. See
@@ -19,4 +19,4 @@ class CefURLRequestContextImpl : public CefURLRequestContext {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestContextImpl);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_IMPL_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_IMPL_H_

libcef/browser/net/url_request_context_proxy.cc

@@ -2,11 +2,11 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#include "libcef/browser/url_request_context_proxy.h"
+#include "libcef/browser/net/url_request_context_proxy.h"
 
-#include "libcef/browser/cookie_store_proxy.h"
+#include "libcef/browser/net/cookie_store_proxy.h"
+#include "libcef/browser/net/url_request_context_impl.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/browser/url_request_context_impl.h"
 
 CefURLRequestContextProxy::CefURLRequestContextProxy(
     CefURLRequestContextImpl* parent,

libcef/browser/net/url_request_context_proxy.h

@@ -2,13 +2,13 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_PROXY_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_PROXY_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_PROXY_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_PROXY_H_
 #pragma once
 
 #include "include/cef_request_context_handler.h"
-#include "libcef/browser/cookie_store_proxy.h"
+#include "libcef/browser/net/cookie_store_proxy.h"
-#include "libcef/browser/url_request_context.h"
+#include "libcef/browser/net/url_request_context.h"
 
 #include "base/memory/scoped_ptr.h"
 
@@ -33,4 +33,4 @@ class CefURLRequestContextProxy : public CefURLRequestContext {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestContextProxy);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_CONTEXT_PROXY_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_PROXY_H_

libcef/browser/net/url_request_interceptor.cc

@@ -2,14 +2,14 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#include "libcef/browser/url_request_interceptor.h"
+#include "libcef/browser/net/url_request_interceptor.h"
 
 #include <string>
 
 #include "libcef/browser/browser_host_impl.h"
-#include "libcef/browser/resource_request_job.h"
+#include "libcef/browser/net/resource_request_job.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/common/http_header_utils.h"
+#include "libcef/common/net/http_header_utils.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/common/response_impl.h"
 

libcef/browser/net/url_request_interceptor.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_INTERCEPTOR_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_INTERCEPTOR_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_INTERCEPTOR_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_INTERCEPTOR_H_
 #pragma once
 
 #include "net/url_request/url_request_interceptor.h"
@@ -30,4 +30,4 @@ class CefRequestInterceptor : public net::URLRequestInterceptor {
   DISALLOW_COPY_AND_ASSIGN(CefRequestInterceptor);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_INTERCEPTOR_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_INTERCEPTOR_H_

libcef/browser/net/url_request_manager.cc

@@ -3,17 +3,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/url_request_manager.h"
+#include "libcef/browser/net/url_request_manager.h"
 
 #include "include/cef_browser.h"
 #include "include/cef_scheme.h"
 #include "libcef/browser/browser_context.h"
 #include "libcef/browser/browser_host_impl.h"
-#include "libcef/browser/resource_request_job.h"
+#include "libcef/browser/net/resource_request_job.h"
-#include "libcef/browser/scheme_handler.h"
+#include "libcef/browser/net/scheme_handler.h"
 #include "libcef/browser/thread_util.h"
+#include "libcef/common/net/scheme_registration.h"
 #include "libcef/common/request_impl.h"
-#include "libcef/common/scheme_registration.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"

libcef/browser/net/url_request_manager.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that can
 // be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_MANAGER_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_MANAGER_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_MANAGER_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_MANAGER_H_
 #pragma once
 
 #include <map>
@@ -77,4 +77,4 @@ class CefURLRequestManager {
   DISALLOW_COPY_AND_ASSIGN(CefURLRequestManager);
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_MANAGER_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_MANAGER_H_

libcef/browser/net/url_request_user_data.cc

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/browser/url_request_user_data.h"
+#include "libcef/browser/net/url_request_user_data.h"
 
-CefURLRequestUserData::CefURLRequestUserData(CefRefPtr<CefURLRequestClient> client)
+CefURLRequestUserData::CefURLRequestUserData(
+    CefRefPtr<CefURLRequestClient> client)
     : client_(client) {}
 
 CefURLRequestUserData::~CefURLRequestUserData() {}

libcef/browser/net/url_request_user_data.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_BROWSER_URL_REQUEST_USER_DATA_H_
+#ifndef CEF_LIBCEF_BROWSER_NET_URL_REQUEST_USER_DATA_H_
-#define CEF_LIBCEF_BROWSER_URL_REQUEST_USER_DATA_H_
+#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_USER_DATA_H_
 
 #include "include/cef_base.h"
 #include "base/supports_user_data.h"
@@ -24,4 +24,4 @@ private:
   CefRefPtr<CefURLRequestClient> client_;
 };
 
-#endif  // CEF_LIBCEF_BROWSER_URL_REQUEST_USER_DATA_H_
+#endif  // CEF_LIBCEF_BROWSER_NET_URL_REQUEST_USER_DATA_H_

libcef/browser/resource_context.cc

@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 #include "libcef/browser/resource_context.h"
-#include "libcef/browser/url_request_context_getter.h"
+
+#include "libcef/browser/net/url_request_context_getter.h"
 
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"

libcef/common/cef_messages.h

@@ -6,7 +6,7 @@
 // IPC messages for CEF.
 // Multiply-included message file, hence no include guard.
 
-#include "libcef/common/upload_data.h"
+#include "libcef/common/net/upload_data.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/values.h"

libcef/common/content_client.cc

@@ -10,8 +10,8 @@
 #include "libcef/browser/extensions/pdf_extension_util.h"
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/extensions/extensions_util.h"
+#include "libcef/common/net/scheme_registration.h"
 #include "libcef/common/scheme_registrar_impl.h"
-#include "libcef/common/scheme_registration.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"

libcef/common/net/http_header_utils.cc

@@ -2,7 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "libcef/common/http_header_utils.h"
+#include "libcef/common/net/http_header_utils.h"
+
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 

libcef/common/net/http_header_utils.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_COMMON_HTTP_HEADER_UTILS_H_
+#ifndef CEF_LIBCEF_COMMON_NET_HTTP_HEADER_UTILS_H_
-#define CEF_LIBCEF_COMMON_HTTP_HEADER_UTILS_H_
+#define CEF_LIBCEF_COMMON_NET_HTTP_HEADER_UTILS_H_
 #pragma once
 
 #include <string>
@@ -19,4 +19,4 @@ void ParseHeaders(const std::string& header_str, HeaderMap& map);
 
 };  // namespace HttpHeaderUtils
 
-#endif  // CEF_LIBCEF_COMMON_HTTP_HEADER_UTILS_H_
+#endif  // CEF_LIBCEF_COMMON_NET_HTTP_HEADER_UTILS_H_

libcef/common/net/net_resource_provider.cc

@@ -3,7 +3,7 @@
 // can be found in the LICENSE file.
 
 #include "libcef/common/content_client.h"
-#include "libcef/common/net_resource_provider.h"
+#include "libcef/common/net/net_resource_provider.h"
 
 base::StringPiece NetResourceProvider(int key) {
   return CefContentClient::Get()->GetDataResource(key, ui::SCALE_FACTOR_NONE);

libcef/common/net/scheme_registration.cc

@@ -2,7 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "libcef/common/scheme_registration.h"
+#include "libcef/common/net/scheme_registration.h"
+
 #include "libcef/common/content_client.h"
 
 #include "content/public/common/url_constants.h"

libcef/common/net/scheme_registration.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_COMMON_SCHEME_REGISTRATION_H_
+#ifndef CEF_LIBCEF_COMMON_NET_SCHEME_REGISTRATION_H_
-#define CEF_LIBCEF_COMMON_SCHEME_REGISTRATION_H_
+#define CEF_LIBCEF_COMMON_NET_SCHEME_REGISTRATION_H_
 #pragma once
 
 #include <string>
@@ -27,4 +27,4 @@ bool IsInternalProtectedScheme(const std::string& scheme);
 
 }  // namespace scheme
 
-#endif  // CEF_LIBCEF_COMMON_SCHEME_REGISTRATION_H_
+#endif  // CEF_LIBCEF_COMMON_NET_SCHEME_REGISTRATION_H_

libcef/common/net/upload_data.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cef/libcef/common/upload_data.h"
+#include "cef/libcef/common/net/upload_data.h"
 
 #include "base/logging.h"
 

libcef/common/net/upload_data.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_COMMON_UPLOAD_DATA_H_
+#ifndef CEF_LIBCEF_COMMON_NET_UPLOAD_DATA_H_
-#define CEF_LIBCEF_COMMON_UPLOAD_DATA_H_
+#define CEF_LIBCEF_COMMON_NET_UPLOAD_DATA_H_
 
-#include "libcef/common/upload_element.h"
+#include "libcef/common/net/upload_element.h"
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -81,4 +81,4 @@ class NET_EXPORT UploadData
 
 }  // namespace net
 
-#endif  // CEF_LIBCEF_COMMON_UPLOAD_DATA_H_
+#endif  // CEF_LIBCEF_COMMON_NET_UPLOAD_DATA_H_

libcef/common/net/upload_element.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "libcef/common/upload_element.h"
+#include "libcef/common/net/upload_element.h"
 
 #include <algorithm>
 

libcef/common/net/upload_element.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CEF_LIBCEF_COMMON_UPLOAD_ELEMENT_H_
+#ifndef CEF_LIBCEF_COMMON_NET_UPLOAD_ELEMENT_H_
-#define CEF_LIBCEF_COMMON_UPLOAD_ELEMENT_H_
+#define CEF_LIBCEF_COMMON_NET_UPLOAD_ELEMENT_H_
 
 #include <vector>
 
@@ -107,4 +107,4 @@ inline bool operator!=(const UploadElement& a,
 
 }  // namespace net
 
-#endif  // CEF_LIBCEF_COMMON_UPLOAD_ELEMENT_H_
+#endif  // CEF_LIBCEF_COMMON_NET_UPLOAD_ELEMENT_H_

libcef/common/request_impl.cc

@@ -5,10 +5,10 @@
 #include <string>
 #include <vector>
 
-#include "libcef/common/http_header_utils.h"
+#include "libcef/common/net/http_header_utils.h"
+#include "libcef/common/net/upload_data.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/common/task_runner_impl.h"
-#include "libcef/common/upload_data.h"
 
 #include "base/logging.h"
 #include "components/navigation_interception/navigation_params.h"

libcef/renderer/frame_impl.cc

@@ -5,7 +5,7 @@
 #include "libcef/renderer/frame_impl.h"
 
 #include "libcef/common/cef_messages.h"
-#include "libcef/common/http_header_utils.h"
+#include "libcef/common/net/http_header_utils.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/renderer/browser_impl.h"
 #include "libcef/renderer/dom_document_impl.h"

libcef/renderer/render_process_observer.cc

@@ -5,7 +5,7 @@
 
 #include "libcef/renderer/render_process_observer.h"
 #include "libcef/common/cef_messages.h"
-#include "libcef/common/net_resource_provider.h"
+#include "libcef/common/net/net_resource_provider.h"
 #include "libcef/renderer/content_renderer_client.h"
 
 #include "net/base/net_module.h"