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

Side by Side Diff: net/url_request/url_request_unittest.cc

Issue 2842263003: Switch SupportsUserData uses to use unique_ptr. (Closed)
Patch Set: clean Created 3 years, 7 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
« no previous file with comments | « net/url_request/url_request_http_job_unittest.cc ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 11 matching lines...) Expand all
22 #include "base/base64url.h" 22 #include "base/base64url.h"
23 #include "base/bind.h" 23 #include "base/bind.h"
24 #include "base/compiler_specific.h" 24 #include "base/compiler_specific.h"
25 #include "base/files/file_path.h" 25 #include "base/files/file_path.h"
26 #include "base/files/file_util.h" 26 #include "base/files/file_util.h"
27 #include "base/files/scoped_temp_dir.h" 27 #include "base/files/scoped_temp_dir.h"
28 #include "base/format_macros.h" 28 #include "base/format_macros.h"
29 #include "base/json/json_reader.h" 29 #include "base/json/json_reader.h"
30 #include "base/location.h" 30 #include "base/location.h"
31 #include "base/macros.h" 31 #include "base/macros.h"
32 #include "base/memory/ptr_util.h"
32 #include "base/memory/weak_ptr.h" 33 #include "base/memory/weak_ptr.h"
33 #include "base/message_loop/message_loop.h" 34 #include "base/message_loop/message_loop.h"
34 #include "base/path_service.h" 35 #include "base/path_service.h"
35 #include "base/power_monitor/power_monitor.h" 36 #include "base/power_monitor/power_monitor.h"
36 #include "base/power_monitor/power_monitor_source.h" 37 #include "base/power_monitor/power_monitor_source.h"
37 #include "base/run_loop.h" 38 #include "base/run_loop.h"
38 #include "base/single_thread_task_runner.h" 39 #include "base/single_thread_task_runner.h"
39 #include "base/strings/string_number_conversions.h" 40 #include "base/strings/string_number_conversions.h"
40 #include "base/strings/string_piece.h" 41 #include "base/strings/string_piece.h"
41 #include "base/strings/string_split.h" 42 #include "base/strings/string_split.h"
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 // Intercept the main request and respond with a simple response. 1654 // Intercept the main request and respond with a simple response.
1654 interceptor()->set_intercept_main_request(true); 1655 interceptor()->set_intercept_main_request(true);
1655 interceptor()->set_main_headers(MockURLRequestInterceptor::ok_headers()); 1656 interceptor()->set_main_headers(MockURLRequestInterceptor::ok_headers());
1656 interceptor()->set_main_data(MockURLRequestInterceptor::ok_data()); 1657 interceptor()->set_main_data(MockURLRequestInterceptor::ok_data());
1657 TestDelegate d; 1658 TestDelegate d;
1658 std::unique_ptr<URLRequest> req(default_context().CreateRequest( 1659 std::unique_ptr<URLRequest> req(default_context().CreateRequest(
1659 GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d)); 1660 GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d));
1660 base::SupportsUserData::Data* user_data0 = new base::SupportsUserData::Data(); 1661 base::SupportsUserData::Data* user_data0 = new base::SupportsUserData::Data();
1661 base::SupportsUserData::Data* user_data1 = new base::SupportsUserData::Data(); 1662 base::SupportsUserData::Data* user_data1 = new base::SupportsUserData::Data();
1662 base::SupportsUserData::Data* user_data2 = new base::SupportsUserData::Data(); 1663 base::SupportsUserData::Data* user_data2 = new base::SupportsUserData::Data();
1663 req->SetUserData(nullptr, user_data0); 1664 req->SetUserData(nullptr, base::WrapUnique(user_data0));
1664 req->SetUserData(&user_data1, user_data1); 1665 req->SetUserData(&user_data1, base::WrapUnique(user_data1));
1665 req->SetUserData(&user_data2, user_data2); 1666 req->SetUserData(&user_data2, base::WrapUnique(user_data2));
1666 req->set_method("GET"); 1667 req->set_method("GET");
1667 req->Start(); 1668 req->Start();
1668 base::RunLoop().Run(); 1669 base::RunLoop().Run();
1669 1670
1670 // Make sure we can retrieve our specific user data. 1671 // Make sure we can retrieve our specific user data.
1671 EXPECT_EQ(user_data0, req->GetUserData(nullptr)); 1672 EXPECT_EQ(user_data0, req->GetUserData(nullptr));
1672 EXPECT_EQ(user_data1, req->GetUserData(&user_data1)); 1673 EXPECT_EQ(user_data1, req->GetUserData(&user_data1));
1673 EXPECT_EQ(user_data2, req->GetUserData(&user_data2)); 1674 EXPECT_EQ(user_data2, req->GetUserData(&user_data2));
1674 1675
1675 // Check that we got one good response. 1676 // Check that we got one good response.
(...skipping 9252 matching lines...) Expand 10 before | Expand all | Expand 10 after
10928 AddTestInterceptor()->set_main_intercept_job(std::move(job)); 10929 AddTestInterceptor()->set_main_intercept_job(std::move(job));
10929 10930
10930 req->Start(); 10931 req->Start();
10931 req->Cancel(); 10932 req->Cancel();
10932 base::RunLoop().RunUntilIdle(); 10933 base::RunLoop().RunUntilIdle();
10933 EXPECT_EQ(ERR_ABORTED, d.request_status()); 10934 EXPECT_EQ(ERR_ABORTED, d.request_status());
10934 EXPECT_EQ(0, d.received_redirect_count()); 10935 EXPECT_EQ(0, d.received_redirect_count());
10935 } 10936 }
10936 10937
10937 } // namespace net 10938 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_http_job_unittest.cc ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698