Issue 849030  has been merged into this issue.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c57280bed803e6468633d57af7c149215e119fa5

commit c57280bed803e6468633d57af7c149215e119fa5
Author: Clark DuVall <cduvall@chromium.org>
Date: Tue Jun 19 03:46:23 2018

Check cookie access when getting or setting cookies in network service

This matches the behavior in ChromeNetworkDelegate.

Third party cookie handling has been moved from NetworkContext to
CookieManager.

Note: A lot of these files changed are removing the unnecessary
CookieOptions arg from a bunch of methods.


Bug:  789636 ,  789632 
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Change-Id: I241cb396e588c433cf723c1effa8ea2c64f72266
Reviewed-on: https://chromium-review.googlesource.com/1100105
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568325}
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/android_webview/browser/aw_content_browser_client.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/android_webview/browser/aw_content_browser_client.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/android_webview/browser/aw_cookie_access_policy.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/android_webview/browser/aw_cookie_access_policy.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/chrome_content_browser_client.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/content_settings/content_settings_browsertest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/content_settings/tab_specific_content_settings.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/content_settings/tab_specific_content_settings.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/profiles/profile_impl.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/components/content_settings/core/browser/cookie_settings.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/components/content_settings/core/browser/cookie_settings.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/components/content_settings/core/common/cookie_settings_base.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/components/content_settings/core/common/cookie_settings_base.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/components/content_settings/core/common/cookie_settings_base_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/content/browser/frame_host/render_frame_message_filter.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/content/browser/network_service_client.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/content/browser/network_service_client.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/content/public/browser/content_browser_client.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/content/public/browser/content_browser_client.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/content/shell/browser/layout_test/blink_test_controller.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/headless/lib/browser/headless_content_browser_client.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/headless/lib/browser/headless_content_browser_client.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/cookie_manager.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/cookie_manager.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/cookie_manager_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/cookie_settings.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/cookie_settings.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/cookie_settings_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/network_context.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/network_context.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/network_service_network_delegate.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/network_service_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/public/mojom/cookie_manager.mojom
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/public/mojom/network_context.mojom
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/public/mojom/network_service.mojom
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/test/test_network_context.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/url_loader.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/url_loader.h
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/services/network/url_loader_unittest.cc
[modify] https://crrev.com/c57280bed803e6468633d57af7c149215e119fa5/testing/buildbot/filters/mojo.fyi.network_browser_tests.filter

Could we remove the ChromeNetworkDelegate implementation of OnCanGetCookies and OnCanSetCookies, in favor of the NetworkServiceNetworkDelegate one, by moving the network service delegate one over to NetworkContext::ContextNetworkDelegate, and fixing up LayeredNetworkDelegate a bit?

Much like this CL does for another method:  https://chromium-review.googlesource.com/c/chromium/src/+/1103119

The advantages of that approach are that the new code will be used in production, so it will be better tested before we launch the network service, we don't have to worry about maintaining code needed for the old path, and it's a bit clearer what work still needs to be done to implement the remaining ChromeNetworkDelegate features when the network service is enabled.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8420d58c08a2b1dd5a0a414e44284491a5518331

commit 8420d58c08a2b1dd5a0a414e44284491a5518331
Author: Clark DuVall <cduvall@chromium.org>
Date: Wed Jun 27 20:05:01 2018

Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic

This was suggested in  crbug.com/789636  so this logic can run in
production before the launch of the network service.

Had to keep the tab notification logic in each delegate, since the
way NetworkServiceNetworkDelegate maps the request back to the
original tab (using the URLLoader set as user data on the request)
does not work if network service is disabled.

Bug:  789636 ,  789632 
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I22395f914639d8ce83457a63062927e876caeaa9
Reviewed-on: https://chromium-review.googlesource.com/1113903
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570877}
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/android_webview/browser/net/aw_network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/android_webview/browser/net/aw_network_delegate.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/chrome/browser/android/download/intercept_download_resource_throttle.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/components/cronet/cronet_url_request_context.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/content/shell/browser/shell_network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/content/shell/browser/shell_network_delegate.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/ios/chrome/browser/net/ios_chrome_network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/ios/chrome/browser/net/ios_chrome_network_delegate.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/layered_network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/layered_network_delegate.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/layered_network_delegate_unittest.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/network_delegate.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/network_delegate_impl.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/base/network_delegate_impl.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/proxy_resolution/network_delegate_error_observer_unittest.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/url_request/url_request.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/url_request/url_request_context_builder.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/url_request/url_request_test_util.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/net/url_request/url_request_test_util.h
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/services/network/BUILD.gn
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/services/network/network_context.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/services/network/network_context_unittest.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/services/network/network_service_network_delegate.cc
[modify] https://crrev.com/8420d58c08a2b1dd5a0a414e44284491a5518331/services/network/network_service_network_delegate.h
[delete] https://crrev.com/d665ffc963e72121d16059a3b48aa99397fb0031/services/network/network_service_network_delegate_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/150c7353da386029eac1513f22257a3717ebf991

commit 150c7353da386029eac1513f22257a3717ebf991
Author: Clark DuVall <cduvall@chromium.org>
Date: Wed Aug 29 00:02:34 2018

Revert "Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic"

This reverts commit 8420d58c08a2b1dd5a0a414e44284491a5518331.

Reason for revert: This breaks the sign-in on the print dialog when third party
cookies are blocked:  http://crbug.com/878051 .
This is because the network service does not have the custom logic to whitelist
chrome:// or chrome-extensions:// schemes, which used to be here:
https://cs.chromium.org/chromium/src/components/content_settings/core/browser/cookie_settings.cc?l=98&rcl=5edbbd319ff4010b66e07ec404a3188716a9cda2

The print dialog issues requests from chrome://print, which was now blocked from
using third party cookies.

Original change's description:
> Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic
>
> This was suggested in  crbug.com/789636  so this logic can run in
> production before the launch of the network service.
>
> Had to keep the tab notification logic in each delegate, since the
> way NetworkServiceNetworkDelegate maps the request back to the
> original tab (using the URLLoader set as user data on the request)
> does not work if network service is disabled.
>
> Bug:  789636 ,  789632 
> Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
> Change-Id: I22395f914639d8ce83457a63062927e876caeaa9
> Reviewed-on: https://chromium-review.googlesource.com/1113903
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#570877}

Bug:  878051 ,  789636 ,  789632 
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo
Change-Id: Ib023acff943f992c8b6ec8b15bbdbc1524ed3720
Reviewed-on: https://chromium-review.googlesource.com/1194329
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586944}
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/android_webview/browser/net/aw_network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/android_webview/browser/net/aw_network_delegate.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/chrome/browser/android/download/intercept_download_resource_throttle.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/components/cronet/cronet_url_request_context.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/content/shell/browser/shell_network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/content/shell/browser/shell_network_delegate.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/ios/chrome/browser/net/ios_chrome_network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/ios/chrome/browser/net/ios_chrome_network_delegate.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/layered_network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/layered_network_delegate.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/layered_network_delegate_unittest.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/network_delegate.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/network_delegate_impl.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/base/network_delegate_impl.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/proxy_resolution/network_delegate_error_observer_unittest.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/url_request/url_request.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/url_request/url_request_context_builder.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/url_request/url_request_test_util.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/net/url_request/url_request_test_util.h
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/BUILD.gn
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/network_context.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/network_context_unittest.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/network_service_network_delegate.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/network_service_network_delegate.h
[add] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/network_service_network_delegate_unittest.cc
[modify] https://crrev.com/150c7353da386029eac1513f22257a3717ebf991/services/network/network_service_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/05c6076c45368bc3557e639b20dd4a1dc143314e

commit 05c6076c45368bc3557e639b20dd4a1dc143314e
Author: Clark DuVall <cduvall@chromium.org>
Date: Wed Aug 29 06:40:06 2018

Revert "Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic"

This reverts commit 8420d58c08a2b1dd5a0a414e44284491a5518331.

Reason for revert: This breaks the sign-in on the print dialog when third party
cookies are blocked:  http://crbug.com/878051 .
This is because the network service does not have the custom logic to whitelist
chrome:// or chrome-extensions:// schemes, which used to be here:
https://cs.chromium.org/chromium/src/components/content_settings/core/browser/cookie_settings.cc?l=98&rcl=5edbbd319ff4010b66e07ec404a3188716a9cda2

The print dialog issues requests from chrome://print, which was now blocked from
using third party cookies.

Original change's description:
> Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic
>
> This was suggested in  crbug.com/789636  so this logic can run in
> production before the launch of the network service.
>
> Had to keep the tab notification logic in each delegate, since the
> way NetworkServiceNetworkDelegate maps the request back to the
> original tab (using the URLLoader set as user data on the request)
> does not work if network service is disabled.
>
> Bug:  789636 ,  789632 
> Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
> Change-Id: I22395f914639d8ce83457a63062927e876caeaa9
> Reviewed-on: https://chromium-review.googlesource.com/1113903
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#570877}

Bug:  878051 ,  789636 ,  789632 
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo
Change-Id: Ib023acff943f992c8b6ec8b15bbdbc1524ed3720
Reviewed-on: https://chromium-review.googlesource.com/1194329
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#586944}(cherry picked from commit 150c7353da386029eac1513f22257a3717ebf991)
Reviewed-on: https://chromium-review.googlesource.com/1195153
Reviewed-by: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/3535@{#5}
Cr-Branched-From: 4d18295073a6bf8f2f4d26e4e059767e091eaaf3-refs/heads/master@{#586474}
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/android_webview/browser/net/aw_network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/android_webview/browser/net/aw_network_delegate.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/chrome/browser/android/download/intercept_download_resource_throttle.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/components/cronet/cronet_url_request_context.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/content/shell/browser/shell_network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/content/shell/browser/shell_network_delegate.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/ios/chrome/browser/net/ios_chrome_network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/ios/chrome/browser/net/ios_chrome_network_delegate.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/layered_network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/layered_network_delegate.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/layered_network_delegate_unittest.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/network_delegate.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/network_delegate_impl.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/base/network_delegate_impl.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/proxy_resolution/network_delegate_error_observer_unittest.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/url_request/url_request.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/url_request/url_request_context_builder.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/url_request/url_request_test_util.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/net/url_request/url_request_test_util.h
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/BUILD.gn
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/network_context.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/network_context_unittest.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/network_service_network_delegate.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/network_service_network_delegate.h
[add] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/network_service_network_delegate_unittest.cc
[modify] https://crrev.com/05c6076c45368bc3557e639b20dd4a1dc143314e/services/network/network_service_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/36f832483da0f645784a0e9b25cda3860e510ca2

commit 36f832483da0f645784a0e9b25cda3860e510ca2
Author: Clark DuVall <cduvall@chromium.org>
Date: Wed Aug 29 18:58:29 2018

Revert "Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic"

This reverts commit 8420d58c08a2b1dd5a0a414e44284491a5518331.

Reason for revert: This breaks the sign-in on the print dialog when third party
cookies are blocked:  http://crbug.com/878051 .
This is because the network service does not have the custom logic to whitelist
chrome:// or chrome-extensions:// schemes, which used to be here:
https://cs.chromium.org/chromium/src/components/content_settings/core/browser/cookie_settings.cc?l=98&rcl=5edbbd319ff4010b66e07ec404a3188716a9cda2

The print dialog issues requests from chrome://print, which was now blocked from
using third party cookies.

Original change's description:
> Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic
>
> This was suggested in  crbug.com/789636  so this logic can run in
> production before the launch of the network service.
>
> Had to keep the tab notification logic in each delegate, since the
> way NetworkServiceNetworkDelegate maps the request back to the
> original tab (using the URLLoader set as user data on the request)
> does not work if network service is disabled.
>
> Bug:  789636 ,  789632 
> Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
> Change-Id: I22395f914639d8ce83457a63062927e876caeaa9
> Reviewed-on: https://chromium-review.googlesource.com/1113903
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#570877}

TBR=cduvall@chromium.org

(cherry picked from commit 150c7353da386029eac1513f22257a3717ebf991)

Bug:  878051 ,  789636 ,  789632 
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ib023acff943f992c8b6ec8b15bbdbc1524ed3720
Reviewed-on: https://chromium-review.googlesource.com/1194329
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#586944}
Reviewed-on: https://chromium-review.googlesource.com/1195751
Reviewed-by: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#841}
Cr-Branched-From: 271eaf50594eb818c9295dc78d364aea18c82ea8-refs/heads/master@{#576753}
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/android_webview/browser/net/aw_network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/android_webview/browser/net/aw_network_delegate.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/chrome/browser/android/download/intercept_download_resource_throttle.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/components/cronet/cronet_url_request_context.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/content/shell/browser/shell_network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/content/shell/browser/shell_network_delegate.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/ios/chrome/browser/net/ios_chrome_network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/ios/chrome/browser/net/ios_chrome_network_delegate.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/layered_network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/layered_network_delegate.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/layered_network_delegate_unittest.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/network_delegate.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/network_delegate_impl.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/base/network_delegate_impl.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/proxy_resolution/network_delegate_error_observer_unittest.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/url_request/url_request.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/url_request/url_request_context_builder.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/url_request/url_request_test_util.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/net/url_request/url_request_test_util.h
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/services/network/BUILD.gn
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/services/network/network_context.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/services/network/network_context_unittest.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/services/network/network_service_network_delegate.cc
[modify] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/services/network/network_service_network_delegate.h
[add] https://crrev.com/36f832483da0f645784a0e9b25cda3860e510ca2/services/network/network_service_network_delegate_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e873764be569975947a71da6323c690f1a25e50e

commit e873764be569975947a71da6323c690f1a25e50e
Author: Clark DuVall <cduvall@chromium.org>
Date: Fri Aug 31 17:26:34 2018

Reland "Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic"

This reverts commit 150c7353da386029eac1513f22257a3717ebf991.

Added some more tests, and support for the special casing of chrome:// URLs.
The chrome-extension:// case is only needed when network service is disabled,
since chrome-extension:// requests only use the URLRequestContext in that case.

See diff after Patchset 1 for changes since the original.

Original change's description:
> Revert "Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic"
>
> This reverts commit 8420d58c08a2b1dd5a0a414e44284491a5518331.
>
> Reason for revert: This breaks the sign-in on the print dialog when third party
> cookies are blocked:  http://crbug.com/878051 .
> This is because the network service does not have the custom logic to whitelist
> chrome:// or chrome-extensions:// schemes, which used to be here:
> https://cs.chromium.org/chromium/src/components/content_settings/core/browser/cookie_settings.cc?l=98&rcl=5edbbd319ff4010b66e07ec404a3188716a9cda2
>
> The print dialog issues requests from chrome://print, which was now blocked from
> using third party cookies.
>
> Original change's description:
> > Unify ChromeNetworkDelegate and NetworkServiceNetworkDelegate cookie logic
> >
> > This was suggested in  crbug.com/789636  so this logic can run in
> > production before the launch of the network service.
> >
> > Had to keep the tab notification logic in each delegate, since the
> > way NetworkServiceNetworkDelegate maps the request back to the
> > original tab (using the URLLoader set as user data on the request)
> > does not work if network service is disabled.
> >
> > Bug:  789636 ,  789632 
> > Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
> > Change-Id: I22395f914639d8ce83457a63062927e876caeaa9
> > Reviewed-on: https://chromium-review.googlesource.com/1113903
> > Reviewed-by: Matt Menke <mmenke@chromium.org>
> > Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> > Commit-Queue: Clark DuVall <cduvall@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#570877}
>
> Bug:  878051 ,  789636 ,  789632 
> Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo
> Change-Id: Ib023acff943f992c8b6ec8b15bbdbc1524ed3720
> Reviewed-on: https://chromium-review.googlesource.com/1194329
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#586944}

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester
Change-Id: Ia2b596baeacd1d25d99104db88403846e251f806
Bug:  878051 ,  789636 ,  789632 
Reviewed-on: https://chromium-review.googlesource.com/1195147
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588072}
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/android_webview/browser/net/aw_network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/android_webview/browser/net/aw_network_delegate.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/chrome/browser/android/download/intercept_download_resource_throttle.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/chrome/browser/net/chrome_network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/chrome/browser/net/chrome_network_delegate.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/chrome/browser/net/chrome_network_delegate_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/chrome/browser/net/network_context_configuration_browsertest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/chrome/browser/net/profile_network_context_service.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/components/cronet/cronet_url_request_context.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/content/shell/browser/shell_network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/content/shell/browser/shell_network_delegate.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/ios/chrome/browser/net/ios_chrome_network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/ios/chrome/browser/net/ios_chrome_network_delegate.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/layered_network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/layered_network_delegate.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/layered_network_delegate_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/network_delegate.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/network_delegate_impl.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/base/network_delegate_impl.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/proxy_resolution/network_delegate_error_observer_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/url_request/url_request.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/url_request/url_request_context_builder.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/url_request/url_request_test_util.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/net/url_request/url_request_test_util.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/BUILD.gn
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/cookie_manager.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/cookie_settings.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/cookie_settings.h
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/cookie_settings_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/network_context.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/network_context_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/network_service_network_delegate.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/network_service_network_delegate.h
[delete] https://crrev.com/24565e4134dafe85af45f9e02a26afdb5e8f847d/services/network/network_service_network_delegate_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/network_service_unittest.cc
[modify] https://crrev.com/e873764be569975947a71da6323c690f1a25e50e/services/network/public/mojom/cookie_manager.mojom