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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 2257113002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <queue> 10 #include <queue>
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 GURL request_url("http://www.example.com"); 514 GURL request_url("http://www.example.com");
515 std::unique_ptr<net::URLRequest> request( 515 std::unique_ptr<net::URLRequest> request(
516 context_->CreateRequest(request_url, net::DEFAULT_PRIORITY, &delegate_)); 516 context_->CreateRequest(request_url, net::DEFAULT_PRIORITY, &delegate_));
517 request->set_method(method); 517 request->set_method(method);
518 if (content_type != NULL) { 518 if (content_type != NULL) {
519 request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType, 519 request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType,
520 content_type, 520 content_type,
521 true /* overwrite */); 521 true /* overwrite */);
522 } 522 }
523 std::vector<std::unique_ptr<net::UploadElementReader>> element_readers; 523 std::vector<std::unique_ptr<net::UploadElementReader>> element_readers;
524 element_readers.push_back(base::WrapUnique( 524 element_readers.push_back(base::MakeUnique<net::UploadBytesElementReader>(
525 new net::UploadBytesElementReader(&(bytes_1[0]), bytes_1.size()))); 525 &(bytes_1[0]), bytes_1.size()));
526 element_readers.push_back(base::WrapUnique(new net::UploadFileElementReader( 526 element_readers.push_back(base::MakeUnique<net::UploadFileElementReader>(
527 base::ThreadTaskRunnerHandle::Get().get(), base::FilePath(), 0, 0, 527 base::ThreadTaskRunnerHandle::Get().get(), base::FilePath(), 0, 0,
528 base::Time()))); 528 base::Time()));
529 element_readers.push_back(base::WrapUnique( 529 element_readers.push_back(base::MakeUnique<net::UploadBytesElementReader>(
530 new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size()))); 530 &(bytes_2[0]), bytes_2.size()));
531 request->set_upload(base::WrapUnique( 531 request->set_upload(base::MakeUnique<net::ElementsUploadDataStream>(
532 new net::ElementsUploadDataStream(std::move(element_readers), 0))); 532 std::move(element_readers), 0));
533 ipc_sender_.PushTask(base::Bind(&base::DoNothing)); 533 ipc_sender_.PushTask(base::Bind(&base::DoNothing));
534 request->Start(); 534 request->Start();
535 } 535 }
536 536
537 TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) { 537 TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) {
538 // We verify that URLRequest body is accessible to OnBeforeRequest listeners. 538 // We verify that URLRequest body is accessible to OnBeforeRequest listeners.
539 // These testing steps are repeated twice in a row: 539 // These testing steps are repeated twice in a row:
540 // 1. Register an extension requesting "requestBody" in ExtraInfoSpec and 540 // 1. Register an extension requesting "requestBody" in ExtraInfoSpec and
541 // file a POST URLRequest with a multipart-encoded form. See it getting 541 // file a POST URLRequest with a multipart-encoded form. See it getting
542 // parsed. 542 // parsed.
(...skipping 1804 matching lines...) Expand 10 before | Expand all | Expand 10 after
2347 EXPECT_TRUE(credentials_set); 2347 EXPECT_TRUE(credentials_set);
2348 EXPECT_FALSE(auth3.Empty()); 2348 EXPECT_FALSE(auth3.Empty());
2349 EXPECT_EQ(username, auth1.username()); 2349 EXPECT_EQ(username, auth1.username());
2350 EXPECT_EQ(password, auth1.password()); 2350 EXPECT_EQ(password, auth1.password());
2351 EXPECT_EQ(1u, warning_set.size()); 2351 EXPECT_EQ(1u, warning_set.size());
2352 EXPECT_TRUE(HasWarning(warning_set, "extid2")); 2352 EXPECT_TRUE(HasWarning(warning_set, "extid2"));
2353 EXPECT_EQ(3u, capturing_net_log.GetSize()); 2353 EXPECT_EQ(3u, capturing_net_log.GetSize());
2354 } 2354 }
2355 2355
2356 } // namespace extensions 2356 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698