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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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
Index: chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index b69df1d582cb59030eacf4176f9ebb5390e36726..6addaada35743ffdd155adfb385ecdc779b1086c 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "extensions/browser/api/web_request/web_request_permissions.h"
-
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "chrome/common/extensions/extension_test_util.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/browser/api/web_request/web_request_permissions.h"
#include "extensions/browser/info_map.h"
#include "extensions/common/constants.h"
#include "extensions/common/permissions/permissions_data.h"
@@ -104,16 +104,16 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
// Check that requests are rejected based on the destination
for (size_t i = 0; i < arraysize(sensitive_urls); ++i) {
GURL sensitive_url(sensitive_urls[i]);
- scoped_ptr<net::URLRequest> request(context.CreateRequest(
- sensitive_url, net::DEFAULT_PRIORITY, NULL));
+ std::unique_ptr<net::URLRequest> request(
+ context.CreateRequest(sensitive_url, net::DEFAULT_PRIORITY, NULL));
EXPECT_TRUE(WebRequestPermissions::HideRequest(
extension_info_map_.get(), request.get())) << sensitive_urls[i];
}
// Check that requests are accepted if they don't touch sensitive urls.
for (size_t i = 0; i < arraysize(non_sensitive_urls); ++i) {
GURL non_sensitive_url(non_sensitive_urls[i]);
- scoped_ptr<net::URLRequest> request(context.CreateRequest(
- non_sensitive_url, net::DEFAULT_PRIORITY, NULL));
+ std::unique_ptr<net::URLRequest> request(
+ context.CreateRequest(non_sensitive_url, net::DEFAULT_PRIORITY, NULL));
EXPECT_FALSE(WebRequestPermissions::HideRequest(
extension_info_map_.get(), request.get())) << non_sensitive_urls[i];
}
@@ -122,8 +122,8 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
// WebStore.
// Normally this request is not protected:
GURL non_sensitive_url("http://www.google.com/test.js");
- scoped_ptr<net::URLRequest> non_sensitive_request(context.CreateRequest(
- non_sensitive_url, net::DEFAULT_PRIORITY, NULL));
+ std::unique_ptr<net::URLRequest> non_sensitive_request(
+ context.CreateRequest(non_sensitive_url, net::DEFAULT_PRIORITY, NULL));
EXPECT_FALSE(WebRequestPermissions::HideRequest(
extension_info_map_.get(), non_sensitive_request.get()));
// If the origin is labeled by the WebStoreAppId, it becomes protected.
@@ -131,8 +131,8 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
int process_id = 42;
int site_instance_id = 23;
int view_id = 17;
- scoped_ptr<net::URLRequest> sensitive_request(context.CreateRequest(
- non_sensitive_url, net::DEFAULT_PRIORITY, NULL));
+ std::unique_ptr<net::URLRequest> sensitive_request(
+ context.CreateRequest(non_sensitive_url, net::DEFAULT_PRIORITY, NULL));
ResourceRequestInfo::AllocateForTesting(sensitive_request.get(),
content::RESOURCE_TYPE_SCRIPT,
NULL,
@@ -153,7 +153,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest,
TestCanExtensionAccessURL_HostPermissions) {
- scoped_ptr<net::URLRequest> request(context.CreateRequest(
+ std::unique_ptr<net::URLRequest> request(context.CreateRequest(
GURL("http://example.com"), net::DEFAULT_PRIORITY, NULL));
EXPECT_EQ(PermissionsData::ACCESS_ALLOWED,

Powered by Google App Engine
This is Rietveld 408576698