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

Unified Diff: chrome/browser/extensions/extension_install_prompt_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/extension_install_prompt_unittest.cc
diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc
index 64b095a7941702d526c0ed600a79e485287f6bff..63f35a92bdc4be1d68ed15f1ce425b2116a421f2 100644
--- a/chrome/browser/extensions/extension_install_prompt_unittest.cc
+++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc
@@ -2,15 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/extensions/extension_install_prompt.h"
+
#include <stddef.h>
#include <utility>
#include "base/bind.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
-#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
#include "chrome/browser/extensions/extension_service_test_with_install.h"
#include "chrome/browser/extensions/extension_util.h"
@@ -42,7 +44,7 @@ void VerifyPromptIconCallback(
const SkBitmap& expected_bitmap,
ExtensionInstallPromptShowParams* params,
const ExtensionInstallPrompt::DoneCallback& done_callback,
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt) {
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) {
EXPECT_TRUE(gfx::BitmapsAreEqual(prompt->icon().AsBitmap(), expected_bitmap));
quit_closure.Run();
}
@@ -53,7 +55,7 @@ void VerifyPromptPermissionsCallback(
size_t withheld_permissions_count,
ExtensionInstallPromptShowParams* params,
const ExtensionInstallPrompt::DoneCallback& done_callback,
- scoped_ptr<ExtensionInstallPrompt::Prompt> install_prompt) {
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> install_prompt) {
ASSERT_TRUE(install_prompt.get());
EXPECT_EQ(regular_permissions_count,
install_prompt->GetPermissionCount(
@@ -88,7 +90,7 @@ class ExtensionInstallPromptUnitTest : public testing::Test {
private:
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<TestingProfile> profile_;
+ std::unique_ptr<TestingProfile> profile_;
DISALLOW_COPY_AND_ASSIGN(ExtensionInstallPromptUnitTest);
};
@@ -98,7 +100,7 @@ class ExtensionInstallPromptUnitTest : public testing::Test {
TEST_F(ExtensionInstallPromptUnitTest, PromptShowsPermissionWarnings) {
APIPermissionSet api_permissions;
api_permissions.insert(APIPermission::kTab);
- scoped_ptr<const PermissionSet> permission_set(
+ std::unique_ptr<const PermissionSet> permission_set(
new PermissionSet(api_permissions, ManifestPermissionSet(),
URLPatternSet(), URLPatternSet()));
scoped_refptr<const Extension> extension =
@@ -116,7 +118,7 @@ TEST_F(ExtensionInstallPromptUnitTest, PromptShowsPermissionWarnings) {
base::RunLoop run_loop;
prompt.ShowDialog(
ExtensionInstallPrompt::DoneCallback(), extension.get(), nullptr,
- make_scoped_ptr(new ExtensionInstallPrompt::Prompt(
+ base::WrapUnique(new ExtensionInstallPrompt::Prompt(
ExtensionInstallPrompt::PERMISSIONS_PROMPT)),
std::move(permission_set),
base::Bind(&VerifyPromptPermissionsCallback, run_loop.QuitClosure(),
@@ -180,7 +182,7 @@ TEST_F(ExtensionInstallPromptUnitTest,
ExtensionInstallPrompt prompt(factory.CreateWebContents(profile()));
base::RunLoop run_loop;
- scoped_ptr<ExtensionInstallPrompt::Prompt> sub_prompt(
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> sub_prompt(
new ExtensionInstallPrompt::Prompt(
ExtensionInstallPrompt::DELEGATED_PERMISSIONS_PROMPT));
sub_prompt->set_delegated_username("Username");

Powered by Google App Engine
This is Rietveld 408576698