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

Side by Side Diff: content/browser/streams/stream_url_request_job_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « content/browser/streams/stream_url_request_job.h ('k') | content/browser/time_zone_monitor.h » ('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 "content/browser/streams/stream_url_request_job.h"
6
7 #include "base/memory/ptr_util.h"
5 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
6 #include "base/test/test_simple_task_runner.h" 9 #include "base/test/test_simple_task_runner.h"
7 #include "content/browser/streams/stream.h" 10 #include "content/browser/streams/stream.h"
8 #include "content/browser/streams/stream_registry.h" 11 #include "content/browser/streams/stream_registry.h"
9 #include "content/browser/streams/stream_url_request_job.h"
10 #include "content/browser/streams/stream_write_observer.h" 12 #include "content/browser/streams/stream_write_observer.h"
11 #include "net/base/request_priority.h" 13 #include "net/base/request_priority.h"
12 #include "net/http/http_byte_range.h" 14 #include "net/http/http_byte_range.h"
13 #include "net/http/http_response_headers.h" 15 #include "net/http/http_response_headers.h"
14 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
15 #include "net/url_request/url_request_context.h" 17 #include "net/url_request/url_request_context.h"
16 #include "net/url_request/url_request_job_factory_impl.h" 18 #include "net/url_request/url_request_job_factory_impl.h"
17 #include "net/url_request/url_request_test_util.h" 19 #include "net/url_request/url_request_test_util.h"
18 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
19 21
(...skipping 30 matching lines...) Expand all
50 private: 52 private:
51 StreamRegistry* registry_; 53 StreamRegistry* registry_;
52 }; 54 };
53 55
54 StreamURLRequestJobTest() {} 56 StreamURLRequestJobTest() {}
55 57
56 void SetUp() override { 58 void SetUp() override {
57 registry_.reset(new StreamRegistry()); 59 registry_.reset(new StreamRegistry());
58 60
59 url_request_job_factory_.SetProtocolHandler( 61 url_request_job_factory_.SetProtocolHandler(
60 "blob", make_scoped_ptr(new MockProtocolHandler(registry_.get()))); 62 "blob", base::WrapUnique(new MockProtocolHandler(registry_.get())));
61 url_request_context_.set_job_factory(&url_request_job_factory_); 63 url_request_context_.set_job_factory(&url_request_job_factory_);
62 } 64 }
63 65
64 void TearDown() override {} 66 void TearDown() override {}
65 67
66 void TestSuccessRequest(const GURL& url, 68 void TestSuccessRequest(const GURL& url,
67 const std::string& expected_response) { 69 const std::string& expected_response) {
68 TestRequest("GET", url, net::HttpRequestHeaders(), 200, expected_response); 70 TestRequest("GET", url, net::HttpRequestHeaders(), 200, expected_response);
69 } 71 }
70 72
(...skipping 15 matching lines...) Expand all
86 // Verify response. 88 // Verify response.
87 EXPECT_TRUE(request_->status().is_success()); 89 EXPECT_TRUE(request_->status().is_success());
88 ASSERT_TRUE(request_->response_headers()); 90 ASSERT_TRUE(request_->response_headers());
89 EXPECT_EQ(expected_status_code, 91 EXPECT_EQ(expected_status_code,
90 request_->response_headers()->response_code()); 92 request_->response_headers()->response_code());
91 EXPECT_EQ(expected_response, delegate.data_received()); 93 EXPECT_EQ(expected_response, delegate.data_received());
92 } 94 }
93 95
94 protected: 96 protected:
95 base::MessageLoopForIO message_loop_; 97 base::MessageLoopForIO message_loop_;
96 scoped_ptr<StreamRegistry> registry_; 98 std::unique_ptr<StreamRegistry> registry_;
97 99
98 net::URLRequestContext url_request_context_; 100 net::URLRequestContext url_request_context_;
99 net::URLRequestJobFactoryImpl url_request_job_factory_; 101 net::URLRequestJobFactoryImpl url_request_job_factory_;
100 scoped_ptr<net::URLRequest> request_; 102 std::unique_ptr<net::URLRequest> request_;
101 }; 103 };
102 104
103 TEST_F(StreamURLRequestJobTest, TestGetSimpleDataRequest) { 105 TEST_F(StreamURLRequestJobTest, TestGetSimpleDataRequest) {
104 scoped_refptr<Stream> stream( 106 scoped_refptr<Stream> stream(
105 new Stream(registry_.get(), NULL, kStreamURL)); 107 new Stream(registry_.get(), NULL, kStreamURL));
106 108
107 scoped_refptr<net::StringIOBuffer> buffer( 109 scoped_refptr<net::StringIOBuffer> buffer(
108 new net::StringIOBuffer(kTestData1)); 110 new net::StringIOBuffer(kTestData1));
109 111
110 stream->AddData(buffer, buffer->size()); 112 stream->AddData(buffer, buffer->size());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 stream->AddData(buffer, buffer->size()); 172 stream->AddData(buffer, buffer->size());
171 stream->Finalize(); 173 stream->Finalize();
172 174
173 net::HttpRequestHeaders extra_headers; 175 net::HttpRequestHeaders extra_headers;
174 extra_headers.SetHeader(net::HttpRequestHeaders::kRange, 176 extra_headers.SetHeader(net::HttpRequestHeaders::kRange,
175 net::HttpByteRange::Bounded(1, 3).GetHeaderValue()); 177 net::HttpByteRange::Bounded(1, 3).GetHeaderValue());
176 TestRequest("GET", kStreamURL, extra_headers, 405, std::string()); 178 TestRequest("GET", kStreamURL, extra_headers, 405, std::string());
177 } 179 }
178 180
179 } // namespace content 181 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/streams/stream_url_request_job.h ('k') | content/browser/time_zone_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698