| Index: chrome/browser/search/iframe_source_unittest.cc
|
| diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc
|
| index 30aee8e13e4a30ee3526f9d9798044caa902dda5..577a38bda501ef9a665602799de95a52dc7e10aa 100644
|
| --- a/chrome/browser/search/iframe_source_unittest.cc
|
| +++ b/chrome/browser/search/iframe_source_unittest.cc
|
| @@ -93,18 +93,19 @@ class IframeSourceTest : public testing::Test {
|
| return "";
|
| }
|
|
|
| - net::URLRequest* MockRequest(
|
| + scoped_ptr<net::URLRequest> MockRequest(
|
| const std::string& url,
|
| bool allocate_info,
|
| int render_process_id,
|
| int render_frame_id) {
|
| - net::URLRequest* request =
|
| - new net::URLRequest(GURL(url),
|
| - net::DEFAULT_PRIORITY,
|
| - NULL,
|
| - resource_context_.GetRequestContext());
|
| + scoped_ptr<net::URLRequest> request(
|
| + resource_context_.GetRequestContext()->CreateRequest(
|
| + GURL(url),
|
| + net::DEFAULT_PRIORITY,
|
| + NULL,
|
| + NULL));
|
| if (allocate_info) {
|
| - content::ResourceRequestInfo::AllocateForTesting(request,
|
| + content::ResourceRequestInfo::AllocateForTesting(request.get(),
|
| ResourceType::SUB_FRAME,
|
| &resource_context_,
|
| render_process_id,
|
| @@ -112,7 +113,7 @@ class IframeSourceTest : public testing::Test {
|
| MSG_ROUTING_NONE,
|
| false);
|
| }
|
| - return request;
|
| + return request.Pass();
|
| }
|
|
|
| void SendResource(int resource_id) {
|
| @@ -159,23 +160,23 @@ class IframeSourceTest : public testing::Test {
|
|
|
| TEST_F(IframeSourceTest, ShouldServiceRequest) {
|
| scoped_ptr<net::URLRequest> request;
|
| - request.reset(MockRequest("http://test/loader.js", true,
|
| - kNonInstantRendererPID, 0));
|
| + request = MockRequest("http://test/loader.js", true,
|
| + kNonInstantRendererPID, 0);
|
| EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
|
| - request.reset(MockRequest("chrome-search://bogus/valid.js", true,
|
| - kInstantRendererPID, 0));
|
| + request = MockRequest("chrome-search://bogus/valid.js", true,
|
| + kInstantRendererPID, 0);
|
| EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
|
| - request.reset(MockRequest("chrome-search://test/bogus.js", true,
|
| - kInstantRendererPID, 0));
|
| + request = MockRequest("chrome-search://test/bogus.js", true,
|
| + kInstantRendererPID, 0);
|
| EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
|
| - request.reset(MockRequest("chrome-search://test/valid.js", true,
|
| - kInstantRendererPID, 0));
|
| + request = MockRequest("chrome-search://test/valid.js", true,
|
| + kInstantRendererPID, 0);
|
| EXPECT_TRUE(source()->ShouldServiceRequest(request.get()));
|
| - request.reset(MockRequest("chrome-search://test/valid.js", true,
|
| - kNonInstantRendererPID, 0));
|
| + request = MockRequest("chrome-search://test/valid.js", true,
|
| + kNonInstantRendererPID, 0);
|
| EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
|
| - request.reset(MockRequest("chrome-search://test/valid.js", true,
|
| - kInvalidRendererPID, 0));
|
| + request = MockRequest("chrome-search://test/valid.js", true,
|
| + kInvalidRendererPID, 0);
|
| EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
|
| }
|
|
|
|
|