Move some files from aw/browser/net to aw/browser/network_service

Move files that are still used in the network service code
path to the /network_service directory.

The idea is that the old /net directory is going to eventually
disappear.

BUG=989842,989104

Change-Id: I28a39353a9b4f4d6cecf04fb78df328272cfdefa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1733547
Commit-Queue: Tim Volodine <timvolodine@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683658}

android_webview/BUILD.gn

@@ -587,28 +587,28 @@ source_set("common") {
     "browser/net/aw_cookie_store_wrapper.h",
     "browser/net/aw_http_user_agent_settings.cc",
     "browser/net/aw_http_user_agent_settings.h",
-    "browser/net/aw_network_change_notifier.cc",
-    "browser/net/aw_network_change_notifier.h",
-    "browser/net/aw_network_change_notifier_factory.cc",
-    "browser/net/aw_network_change_notifier_factory.h",
     "browser/net/aw_proxy_config_monitor.cc",
     "browser/net/aw_proxy_config_monitor.h",
-    "browser/net/aw_web_resource_request.cc",
-    "browser/net/aw_web_resource_request.h",
-    "browser/net/aw_web_resource_response.cc",
-    "browser/net/aw_web_resource_response.h",
     "browser/net/init_native_callback.cc",
     "browser/net/init_native_callback.h",
-    "browser/net/input_stream_reader.cc",
-    "browser/net/input_stream_reader.h",
     "browser/network_service/android_stream_reader_url_loader.cc",
     "browser/network_service/android_stream_reader_url_loader.h",
+    "browser/network_service/aw_network_change_notifier.cc",
+    "browser/network_service/aw_network_change_notifier.h",
+    "browser/network_service/aw_network_change_notifier_factory.cc",
+    "browser/network_service/aw_network_change_notifier_factory.h",
     "browser/network_service/aw_proxying_restricted_cookie_manager.cc",
     "browser/network_service/aw_proxying_restricted_cookie_manager.h",
     "browser/network_service/aw_proxying_url_loader_factory.cc",
     "browser/network_service/aw_proxying_url_loader_factory.h",
     "browser/network_service/aw_url_loader_throttle.cc",
     "browser/network_service/aw_url_loader_throttle.h",
+    "browser/network_service/aw_web_resource_request.cc",
+    "browser/network_service/aw_web_resource_request.h",
+    "browser/network_service/aw_web_resource_response.cc",
+    "browser/network_service/aw_web_resource_response.h",
+    "browser/network_service/input_stream_reader.cc",
+    "browser/network_service/input_stream_reader.h",
     "browser/network_service/net_helpers.cc",
     "browser/network_service/net_helpers.h",
     "browser/permission/aw_permission_request.cc",

android_webview/browser/aw_browser_main_parts.cc

@@ -15,7 +15,7 @@
 #include "android_webview/browser/aw_metrics_service_client.h"
 #include "android_webview/browser/aw_web_ui_controller_factory.h"
 #include "android_webview/browser/memory_metrics_logger.h"
-#include "android_webview/browser/net/aw_network_change_notifier_factory.h"
+#include "android_webview/browser/network_service/aw_network_change_notifier_factory.h"
 #include "android_webview/common/aw_descriptors.h"
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/common/aw_resource.h"

android_webview/browser/aw_contents_client_bridge.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "android_webview/browser/net/aw_web_resource_request.h"
+#include "android_webview/browser/network_service/aw_web_resource_request.h"
 #include "android_webview/browser/safe_browsing/aw_url_checker_delegate_impl.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"

android_webview/browser/aw_contents_io_thread_client.cc

@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "android_webview/browser/input_stream.h"
-#include "android_webview/browser/net/aw_web_resource_request.h"
-#include "android_webview/browser/net/aw_web_resource_response.h"
+#include "android_webview/browser/network_service/aw_web_resource_request.h"
+#include "android_webview/browser/network_service/aw_web_resource_response.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/native_jni/AwContentsBackgroundThreadClient_jni.h"
 #include "android_webview/native_jni/AwContentsIoThreadClient_jni.h"

android_webview/browser/network_service/android_stream_reader_url_loader.cc

@@ -6,7 +6,7 @@
 
 #include "android_webview/browser/aw_feature_list.h"
 #include "android_webview/browser/input_stream.h"
-#include "android_webview/browser/net/input_stream_reader.h"
+#include "android_webview/browser/network_service/input_stream_reader.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/feature_list.h"

android_webview/browser/network_service/android_stream_reader_url_loader.h

@@ -5,7 +5,7 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_ANDROID_STREAM_READER_URL_LOADER_H_
 #define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_ANDROID_STREAM_READER_URL_LOADER_H_
 
-#include "android_webview/browser/net/aw_web_resource_response.h"
+#include "android_webview/browser/network_service/aw_web_resource_response.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/public/cpp/system/simple_watcher.h"
 #include "net/http/http_byte_range.h"

android_webview/browser/net/aw_network_change_notifier.cc → android_webview/browser/network_service/aw_network_change_notifier.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 "android_webview/browser/net/aw_network_change_notifier.h"
+#include "android_webview/browser/network_service/aw_network_change_notifier.h"
 
 namespace android_webview {
 

android_webview/browser/net/aw_network_change_notifier.h → android_webview/browser/network_service/aw_network_change_notifier.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 ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_NETWORK_CHANGE_NOTIFIER_H_
+#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_NETWORK_CHANGE_NOTIFIER_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -63,4 +63,4 @@ class AwNetworkChangeNotifier
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_NETWORK_CHANGE_NOTIFIER_H_

android_webview/browser/net/aw_network_change_notifier_factory.cc → android_webview/browser/network_service/aw_network_change_notifier_factory.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/browser/net/aw_network_change_notifier_factory.h"
+#include "android_webview/browser/network_service/aw_network_change_notifier_factory.h"
 
-#include "android_webview/browser/net/aw_network_change_notifier.h"
+#include "android_webview/browser/network_service/aw_network_change_notifier.h"
 #include "base/memory/ptr_util.h"
 
 namespace android_webview {

android_webview/browser/net/aw_network_change_notifier_factory.h → android_webview/browser/network_service/aw_network_change_notifier_factory.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 ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
+#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
 
 #include <memory>
 
@@ -40,4 +40,4 @@ class AwNetworkChangeNotifierFactory :
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_NETWORK_CHANGE_NOTIFIER_FACTORY_H_

android_webview/browser/network_service/aw_proxying_url_loader_factory.cc

@@ -11,8 +11,8 @@
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/input_stream.h"
-#include "android_webview/browser/net/aw_web_resource_response.h"
 #include "android_webview/browser/network_service/android_stream_reader_url_loader.h"
+#include "android_webview/browser/network_service/aw_web_resource_response.h"
 #include "android_webview/browser/network_service/net_helpers.h"
 #include "android_webview/browser/renderer_host/auto_login_parser.h"
 #include "android_webview/common/url_constants.h"

android_webview/browser/net/aw_web_resource_request.cc → android_webview/browser/network_service/aw_web_resource_request.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 "android_webview/browser/net/aw_web_resource_request.h"
+#include "android_webview/browser/network_service/aw_web_resource_request.h"
 
 #include "content/public/common/resource_type.h"
 #include "net/http/http_request_headers.h"

android_webview/browser/net/aw_web_resource_request.h → android_webview/browser/network_service/aw_web_resource_request.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 ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_REQUEST_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_REQUEST_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_WEB_RESOURCE_REQUEST_H_
+#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_WEB_RESOURCE_REQUEST_H_
 
 #include <string>
 #include <vector>
@@ -67,4 +67,4 @@ struct AwWebResourceRequest final {
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_REQUEST_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_WEB_RESOURCE_REQUEST_H_

android_webview/browser/net/aw_web_resource_response.cc → android_webview/browser/network_service/aw_web_resource_response.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 "android_webview/browser/net/aw_web_resource_response.h"
+#include "android_webview/browser/network_service/aw_web_resource_response.h"
 
 #include <memory>
 

android_webview/browser/net/aw_web_resource_response.h → android_webview/browser/network_service/aw_web_resource_response.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 ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_RESPONSE_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_RESPONSE_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_WEB_RESOURCE_RESPONSE_H_
+#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_WEB_RESOURCE_RESPONSE_H_
 
 #include <memory>
 #include <string>
@@ -54,4 +54,4 @@ class AwWebResourceResponse {
 
 } // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_RESPONSE_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_WEB_RESOURCE_RESPONSE_H_

android_webview/browser/net/input_stream_reader.cc → android_webview/browser/network_service/input_stream_reader.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 "android_webview/browser/net/input_stream_reader.h"
+#include "android_webview/browser/network_service/input_stream_reader.h"
 
 #include "android_webview/browser/input_stream.h"
 #include "content/public/browser/browser_thread.h"

android_webview/browser/net/input_stream_reader.h → android_webview/browser/network_service/input_stream_reader.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 ANDROID_WEBVIEW_BROWSER_NET_INPUT_STREAM_READER_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_INPUT_STREAM_READER_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_INPUT_STREAM_READER_H_
+#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_INPUT_STREAM_READER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -59,4 +59,4 @@ class InputStreamReader {
 
 } // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_INPUT_STREAM_READER_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_INPUT_STREAM_READER_H_

android_webview/browser/net/input_stream_reader_unittest.cc → android_webview/browser/network_service/input_stream_reader_unittest.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 "android_webview/browser/net/input_stream_reader.h"
+#include "android_webview/browser/network_service/input_stream_reader.h"
 
 #include "android_webview/browser/input_stream.h"
 #include "base/android/scoped_java_ref.h"

android_webview/browser/safe_browsing/aw_url_checker_delegate_impl.cc

@@ -7,7 +7,7 @@
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_contents_client_bridge.h"
 #include "android_webview/browser/aw_contents_io_thread_client.h"
-#include "android_webview/browser/net/aw_web_resource_request.h"
+#include "android_webview/browser/network_service/aw_web_resource_request.h"
 #include "android_webview/browser/safe_browsing/aw_safe_browsing_ui_manager.h"
 #include "android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager.h"
 #include "base/bind.h"

android_webview/test/BUILD.gn

@@ -375,8 +375,8 @@ test("android_webview_unittests") {
     "../browser/gfx/test/rendering_test.h",
     "../browser/input_stream_unittest.cc",
     "../browser/net/aw_cookie_store_wrapper_unittest.cc",
-    "../browser/net/input_stream_reader_unittest.cc",
     "../browser/network_service/android_stream_reader_url_loader_unittest.cc",
+    "../browser/network_service/input_stream_reader_unittest.cc",
     "../browser/permission/media_access_permission_request_unittest.cc",
     "../browser/permission/permission_request_handler_unittest.cc",
     "../browser/renderer_host/auto_login_parser_unittest.cc",