Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Side by Side Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2256173002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replace a WrapUnique() nested inside a MakeUnique() Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 std::unique_ptr<net::test_server::BasicHttpResponse> http_response( 222 std::unique_ptr<net::test_server::BasicHttpResponse> http_response(
223 new net::test_server::BasicHttpResponse()); 223 new net::test_server::BasicHttpResponse());
224 http_response->set_content_type("text/javascript"); 224 http_response->set_content_type("text/javascript");
225 return std::move(http_response); 225 return std::move(http_response);
226 } 226 }
227 227
228 std::unique_ptr<net::test_server::HttpResponse> 228 std::unique_ptr<net::test_server::HttpResponse>
229 VerifySaveDataHeaderNotInRequest(const net::test_server::HttpRequest& request) { 229 VerifySaveDataHeaderNotInRequest(const net::test_server::HttpRequest& request) {
230 auto it = request.headers.find("Save-Data"); 230 auto it = request.headers.find("Save-Data");
231 EXPECT_EQ(request.headers.end(), it); 231 EXPECT_EQ(request.headers.end(), it);
232 return base::WrapUnique(new net::test_server::BasicHttpResponse()); 232 return base::MakeUnique<net::test_server::BasicHttpResponse>();
233 } 233 }
234 234
235 std::unique_ptr<net::test_server::HttpResponse> 235 std::unique_ptr<net::test_server::HttpResponse>
236 VerifySaveDataNotInAccessControlRequestHeader( 236 VerifySaveDataNotInAccessControlRequestHeader(
237 const net::test_server::HttpRequest& request) { 237 const net::test_server::HttpRequest& request) {
238 // Save-Data should be present. 238 // Save-Data should be present.
239 auto it = request.headers.find("Save-Data"); 239 auto it = request.headers.find("Save-Data");
240 EXPECT_NE(request.headers.end(), it); 240 EXPECT_NE(request.headers.end(), it);
241 EXPECT_EQ("on", it->second); 241 EXPECT_EQ("on", it->second);
242 242
(...skipping 1782 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 2025
2026 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) { 2026 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) {
2027 const char kPageUrl[] = "/service_worker/disable_web_security_update.html"; 2027 const char kPageUrl[] = "/service_worker/disable_web_security_update.html";
2028 const char kScopeUrl[] = "/service_worker/scope/"; 2028 const char kScopeUrl[] = "/service_worker/scope/";
2029 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js"; 2029 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js";
2030 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl); 2030 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl);
2031 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); 2031 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl);
2032 } 2032 }
2033 2033
2034 } // namespace content 2034 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698