diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 12:48:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 11:11:56 +0000 |
| commit | c69fdae9c762b7bdf45016bf8398f6050b7699ba (patch) | |
| tree | 7f95460374822dbb18bba1f0bad1c09a1427c8a5 /chromium/net/proxy_resolution | |
| parent | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (diff) | |
| download | qtwebengine-chromium-c69fdae9c762b7bdf45016bf8398f6050b7699ba.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.113
Change-Id: I4fb3f077682cc7eda51e9046981dcd40e0183cd6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/net/proxy_resolution')
| -rw-r--r-- | chromium/net/proxy_resolution/network_delegate_error_observer_unittest.cc | 10 | ||||
| -rw-r--r-- | chromium/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/chromium/net/proxy_resolution/network_delegate_error_observer_unittest.cc b/chromium/net/proxy_resolution/network_delegate_error_observer_unittest.cc index 9ddb750d20e..bbe5fbfc41f 100644 --- a/chromium/net/proxy_resolution/network_delegate_error_observer_unittest.cc +++ b/chromium/net/proxy_resolution/network_delegate_error_observer_unittest.cc @@ -66,15 +66,13 @@ class TestNetworkDelegate : public NetworkDelegateImpl { return AUTH_REQUIRED_RESPONSE_NO_ACTION; } bool OnCanGetCookies(const URLRequest& request, - const CookieList& cookie_list, - bool allowed_from_caller) override { - return allowed_from_caller; + const CookieList& cookie_list) override { + return true; } bool OnCanSetCookie(const URLRequest& request, const net::CanonicalCookie& cookie, - CookieOptions* options, - bool allowed_from_caller) override { - return allowed_from_caller; + CookieOptions* options) override { + return true; } bool OnCanAccessFile(const URLRequest& request, const base::FilePath& original_path, diff --git a/chromium/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc b/chromium/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc index abdaeb06081..d0a96504518 100644 --- a/chromium/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc +++ b/chromium/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc @@ -198,16 +198,14 @@ class BasicNetworkDelegate : public NetworkDelegateImpl { } bool OnCanGetCookies(const URLRequest& request, - const CookieList& cookie_list, - bool allowed_from_caller) override { - return allowed_from_caller; + const CookieList& cookie_list) override { + return true; } bool OnCanSetCookie(const URLRequest& request, const net::CanonicalCookie& cookie, - CookieOptions* options, - bool allowed_from_caller) override { - return allowed_from_caller; + CookieOptions* options) override { + return true; } bool OnCanAccessFile(const URLRequest& request, |