summaryrefslogtreecommitdiff
path: root/chromium/net/http/mock_http_cache.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/net/http/mock_http_cache.cc
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
downloadqtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/http/mock_http_cache.cc')
-rw-r--r--chromium/net/http/mock_http_cache.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/http/mock_http_cache.cc b/chromium/net/http/mock_http_cache.cc
index 7a0fba17dfd..cf2ff7e28d0 100644
--- a/chromium/net/http/mock_http_cache.cc
+++ b/chromium/net/http/mock_http_cache.cc
@@ -52,7 +52,7 @@ int GetTestModeForEntry(const std::string& key) {
// If we split the cache by top frame origin, then the origin is prepended to
// the key. Skip to the second url in the key.
if (base::StartsWith(url, "_dk_", base::CompareCase::SENSITIVE)) {
- auto const pos = url.find("\nhttp");
+ auto const pos = url.find(" http");
url = url.substr(pos + 1);
}
@@ -886,7 +886,7 @@ void MockBlockingBackendFactory::FinishCreation() {
if (!fail_)
backend_->reset(new MockDiskCache());
// Running the callback might delete |this|.
- base::ResetAndReturn(&callback_).Run(Result());
+ std::move(callback_).Run(Result());
}
}