|
|
DescriptionMake ProfileIOData's ProxyService fetch PACs with the main URLRequestContext.
This is intended to make servicification a little simpler, since we won't
have to configure a secret global URLRequestContext used just to fetch PAC
scripts.
The system URLRequestContext will be updated in a similar manner in a
followup CL.
BUG=715697
Review-Url: https://codereview.chromium.org/2841163002
Cr-Commit-Position: refs/heads/master@{#469044}
Committed: https://chromium.googlesource.com/chromium/src/+/0a8ca0d1e3ac86cd1d0955fc66a43aaa1eaf7393
Patch Set 1 #Patch Set 2 : Merge #Patch Set 3 : Add null check #Patch Set 4 : Fix Android? #Patch Set 5 : Merge fix #
Total comments: 2
Patch Set 6 : Fix test #Patch Set 7 : cleanup test #Patch Set 8 : Minor test cleanup #
Total comments: 4
Patch Set 9 : Minor test cleanup #Patch Set 10 : Response to comments #Patch Set 11 : Change test URL to not be the test (proxy) server's URL #
Depends on Patchset: Dependent Patchsets: Messages
Total messages: 74 (64 generated)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: linux_chromium_tsan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: android_compile_dbg on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...) android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)
Description was changed from ========== Remove Proxy URLRequestContext BUG= ========== to ========== Remove Proxy URLRequestContext BUG= ==========
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: android_compile_dbg on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...) linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...) cast_shell_android on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...) ios-device on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...) ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...) ios-simulator on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...) ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: android_compile_dbg on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: linux_chromium_tsan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...) mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Patchset #10 (id:180001) has been deleted
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Description was changed from ========== Remove Proxy URLRequestContext BUG= ========== to ========== Make ProfileIOData's ProxyService fetch PACs with the main URLRequestContext. This is intended to make servicification a little simpler, since we won't have to configure a secret global URLRequestContext used just to fetch PAC scripts. The system URLRequestContext will be updated in a similar manner in a followup CL. BUG=715697 ==========
Patchset #7 (id:120001) has been deleted
Patchset #5 (id:80001) has been deleted
Patchset #4 (id:60001) has been deleted
Patchset #4 (id:100001) has been deleted
Patchset #2 (id:20001) has been deleted
Patchset #2 (id:40001) has been deleted
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
mmenke@chromium.org changed reviewers: + eroman@chromium.org
I'll update the IOThread to do the same and remove the ProxyScriptFetcherURLRequestContext in another CL. Figure these CLs are complicated enough to be worth landing separately. https://codereview.chromium.org/2841163002/diff/220001/chrome/browser/profile... File chrome/browser/profiles/profile_impl_io_data.cc (right): https://codereview.chromium.org/2841163002/diff/220001/chrome/browser/profile... chrome/browser/profiles/profile_impl_io_data.cc:466: content::URLRequestInterceptorScopedVector request_interceptors) const { Splitting this method in two does seem a bit ugly, but I'd really like to get rid of InitializeInternal entirely, and move most logic up to ProfileIOData (Which I think will make it easier to switch to using URLRequestContextBuilder, which will make it easier to make the network Service use URLRequestContextBuilder in the exact same way). https://codereview.chromium.org/2841163002/diff/220001/net/test/embedded_test... File net/test/embedded_test_server/embedded_test_server.cc (right): https://codereview.chromium.org/2841163002/diff/220001/net/test/embedded_test... net/test/embedded_test_server/embedded_test_server.cc:81: DCHECK(!io_thread_.get()); This makes sure that we haven't started the accept thread, though we may have created the listen socket.
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was checked by mmenke@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
lgtm https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... File chrome/browser/profiles/profile_io_data.cc (right): https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... chrome/browser/profiles/profile_io_data.cc:1334: return base::WrapUnique<net::NetworkDelegate>( does this work? return std::move(chrome_network_delegate); https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... File chrome/browser/profiles/profile_io_data.h (right): https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... chrome/browser/profiles/profile_io_data.h:452: // Does any necessary addition configuration of the network delegate, additional
Thanks! Sufficiently paranoid about this change that I'll wait until tomorrow to land. https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... File chrome/browser/profiles/profile_io_data.cc (right): https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... chrome/browser/profiles/profile_io_data.cc:1334: return base::WrapUnique<net::NetworkDelegate>( On 2017/05/02 21:29:34, eroman wrote: > does this work? > > return std::move(chrome_network_delegate); Fails to build on Android only. :( https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... File chrome/browser/profiles/profile_io_data.h (right): https://codereview.chromium.org/2841163002/diff/280001/chrome/browser/profile... chrome/browser/profiles/profile_io_data.h:452: // Does any necessary addition configuration of the network delegate, On 2017/05/02 21:29:34, eroman wrote: > additional Done.
The CQ bit was checked by mmenke@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from eroman@chromium.org Link to the patchset: https://codereview.chromium.org/2841163002/#ps340001 (title: "Change test URL to not be the test (proxy) server's URL")
The CQ bit was unchecked by commit-bot@chromium.org
This CL has an open dependency (Issue 2845643003 Patch 260001). Please resolve the dependency and try again. If you are sure that there is no real dependency, please use one of the options listed in https://goo.gl/9Es4OR to land the CL.
On 2017/05/03 16:40:57, commit-bot: I haz the power wrote: > This CL has an open dependency (Issue 2845643003 Patch 260001). Please resolve > the dependency and try again. > If you are sure that there is no real dependency, please use one of the options > listed in https://goo.gl/9Es4OR to land the CL. Oops, thought I landed that.
The CQ bit was checked by mmenke@chromium.org
CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch. Bot data: {"patchset_id": 340001, "attempt_start_ts": 1493831428681900, "parent_rev": "40a227b78d6fed53d06420553275557179546502", "commit_rev": "0a8ca0d1e3ac86cd1d0955fc66a43aaa1eaf7393"}
Message was sent while issue was closed.
Description was changed from ========== Make ProfileIOData's ProxyService fetch PACs with the main URLRequestContext. This is intended to make servicification a little simpler, since we won't have to configure a secret global URLRequestContext used just to fetch PAC scripts. The system URLRequestContext will be updated in a similar manner in a followup CL. BUG=715697 ========== to ========== Make ProfileIOData's ProxyService fetch PACs with the main URLRequestContext. This is intended to make servicification a little simpler, since we won't have to configure a secret global URLRequestContext used just to fetch PAC scripts. The system URLRequestContext will be updated in a similar manner in a followup CL. BUG=715697 Review-Url: https://codereview.chromium.org/2841163002 Cr-Commit-Position: refs/heads/master@{#469044} Committed: https://chromium.googlesource.com/chromium/src/+/0a8ca0d1e3ac86cd1d0955fc66a4... ==========
Message was sent while issue was closed.
Committed patchset #11 (id:340001) as https://chromium.googlesource.com/chromium/src/+/0a8ca0d1e3ac86cd1d0955fc66a4...
Message was sent while issue was closed.
On 2017/05/03 18:40:46, commit-bot: I haz the power wrote: > Committed patchset #11 (id:340001) as > https://chromium.googlesource.com/chromium/src/+/0a8ca0d1e3ac86cd1d0955fc66a4... (Eroman: Just FYI, I decided to put off the IOThread part of this until I can have the IOThread use URLRequestContextBuilder, as I think that order makes the intermediate CLs simpler.)
Message was sent while issue was closed.
acknowledged.
Message was sent while issue was closed.
A revert of this CL (patchset #11 id:340001) has been created in https://codereview.chromium.org/2876463007/ by mmenke@chromium.org. The reason for reverting is: This ran into a race with extension setup. Have a CL out to fix that, but reverting this in the meantime. I'll plan to TBR the reland, since this bug this tickled has no real relation to any code in this CL, but is a pre-existing issue in other code that this tickled.. |