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

Unified Diff: content/browser/webui/url_data_manager_backend_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/webui/url_data_manager_backend.cc ('k') | content/browser/webui/url_data_source_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/url_data_manager_backend_unittest.cc
diff --git a/content/browser/webui/url_data_manager_backend_unittest.cc b/content/browser/webui/url_data_manager_backend_unittest.cc
index f8fefe5fe27903d9af20af820650cf805255fbc2..f52c8084e61f908501a8deca047546f1b2e0bc50 100644
--- a/content/browser/webui/url_data_manager_backend_unittest.cc
+++ b/content/browser/webui/url_data_manager_backend_unittest.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/browser/webui/url_data_manager_backend.h"
+
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
-#include "content/browser/webui/url_data_manager_backend.h"
#include "content/public/test/mock_resource_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/http/http_response_headers.h"
@@ -49,11 +51,14 @@ class UrlDataManagerBackendTest : public testing::Test {
url_request_context_.set_job_factory(&url_request_job_factory_);
}
- scoped_ptr<net::URLRequest> CreateRequest(net::URLRequest::Delegate* delegate,
- const char* origin) {
- scoped_ptr<net::URLRequest> request = url_request_context_.CreateRequest(
- GURL("chrome://resources/polymer/v1_0/polymer/polymer-extracted.js"),
- net::HIGHEST, delegate);
+ std::unique_ptr<net::URLRequest> CreateRequest(
+ net::URLRequest::Delegate* delegate,
+ const char* origin) {
+ std::unique_ptr<net::URLRequest> request =
+ url_request_context_.CreateRequest(
+ GURL(
+ "chrome://resources/polymer/v1_0/polymer/polymer-extracted.js"),
+ net::HIGHEST, delegate);
request->SetExtraRequestHeaderByName("Origin", origin, true);
return request;
}
@@ -67,7 +72,7 @@ class UrlDataManagerBackendTest : public testing::Test {
};
TEST_F(UrlDataManagerBackendTest, AccessControlAllowOriginChromeUrl) {
- scoped_ptr<net::URLRequest> request(
+ std::unique_ptr<net::URLRequest> request(
CreateRequest(&delegate_, "chrome://webui"));
request->Start();
base::RunLoop().RunUntilIdle();
@@ -76,7 +81,7 @@ TEST_F(UrlDataManagerBackendTest, AccessControlAllowOriginChromeUrl) {
}
TEST_F(UrlDataManagerBackendTest, AccessControlAllowOriginNonChromeUrl) {
- scoped_ptr<net::URLRequest> request(
+ std::unique_ptr<net::URLRequest> request(
CreateRequest(&delegate_, "http://www.example.com"));
request->Start();
base::RunLoop().RunUntilIdle();
@@ -86,7 +91,7 @@ TEST_F(UrlDataManagerBackendTest, AccessControlAllowOriginNonChromeUrl) {
// Check that the URLRequest isn't passed headers after cancellation.
TEST_F(UrlDataManagerBackendTest, CancelBeforeResponseStarts) {
- scoped_ptr<net::URLRequest> request(
+ std::unique_ptr<net::URLRequest> request(
CreateRequest(&delegate_, "chrome://webui"));
request->Start();
request->Cancel();
@@ -98,7 +103,7 @@ TEST_F(UrlDataManagerBackendTest, CancelBeforeResponseStarts) {
// Check that the URLRequest isn't passed data after cancellation.
TEST_F(UrlDataManagerBackendTest, CancelAfterFirstReadStarted) {
CancelAfterFirstReadURLRequestDelegate cancel_delegate;
- scoped_ptr<net::URLRequest> request(
+ std::unique_ptr<net::URLRequest> request(
CreateRequest(&cancel_delegate, "chrome://webui"));
request->Start();
base::RunLoop().RunUntilIdle();
@@ -110,9 +115,9 @@ TEST_F(UrlDataManagerBackendTest, CancelAfterFirstReadStarted) {
// Check for a network error page request via chrome://network-error/.
TEST_F(UrlDataManagerBackendTest, ChromeNetworkErrorPageRequest) {
- scoped_ptr<net::URLRequest> error_request =
- url_request_context_.CreateRequest(
- GURL("chrome://network-error/-105"), net::HIGHEST, &delegate_);
+ std::unique_ptr<net::URLRequest> error_request =
+ url_request_context_.CreateRequest(GURL("chrome://network-error/-105"),
+ net::HIGHEST, &delegate_);
error_request->Start();
base::RunLoop().Run();
EXPECT_EQ(net::URLRequestStatus::FAILED, error_request->status().status());
@@ -121,9 +126,9 @@ TEST_F(UrlDataManagerBackendTest, ChromeNetworkErrorPageRequest) {
// Check for an invalid network error page request via chrome://network-error/.
TEST_F(UrlDataManagerBackendTest, ChromeNetworkErrorPageRequestFailed) {
- scoped_ptr<net::URLRequest> error_request =
- url_request_context_.CreateRequest(
- GURL("chrome://network-error/-123456789"), net::HIGHEST, &delegate_);
+ std::unique_ptr<net::URLRequest> error_request =
+ url_request_context_.CreateRequest(
+ GURL("chrome://network-error/-123456789"), net::HIGHEST, &delegate_);
error_request->Start();
base::RunLoop().Run();
EXPECT_EQ(net::URLRequestStatus::FAILED, error_request->status().status());
« no previous file with comments | « content/browser/webui/url_data_manager_backend.cc ('k') | content/browser/webui/url_data_source_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698