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

Unified Diff: chrome/browser/extensions/api/copresence/copresence_api_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/copresence/copresence_api_unittest.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
index ff79a4c7104ad77a5800fc0a293694076a9a3be9..298047243fe869d52f1129a8cf7bee1aea05bacc 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/json/json_writer.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_api_unittest.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
@@ -110,12 +111,12 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
CopresenceService::GetFactoryInstance()->Get(profile());
copresence_manager_ = new FakeCopresenceManager(service);
service->set_manager_for_testing(
- make_scoped_ptr<CopresenceManager>(copresence_manager_));
+ base::WrapUnique<CopresenceManager>(copresence_manager_));
}
// Takes ownership of the operation_list.
bool ExecuteOperations(ListValue* operation_list) {
- scoped_ptr<ListValue> args_list(new ListValue);
+ std::unique_ptr<ListValue> args_list(new ListValue);
args_list->Append(operation_list);
scoped_refptr<UIThreadExtensionFunction> function =
@@ -128,7 +129,7 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
return function->GetResultList();
}
- bool ExecuteOperation(scoped_ptr<Operation> operation) {
+ bool ExecuteOperation(std::unique_ptr<Operation> operation) {
ListValue* operation_list = new ListValue;
operation_list->Append(operation->ToValue().release());
return ExecuteOperations(operation_list);
@@ -155,11 +156,11 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
};
TEST_F(CopresenceApiUnittest, Publish) {
- scoped_ptr<PublishOperation> publish(CreatePublish("pub"));
+ std::unique_ptr<PublishOperation> publish(CreatePublish("pub"));
publish->strategies.reset(new Strategy);
publish->strategies->only_broadcast.reset(new bool(true)); // Default
- scoped_ptr<Operation> operation(new Operation);
+ std::unique_ptr<Operation> operation(new Operation);
operation->publish = std::move(publish);
clear_app_id();
@@ -181,12 +182,12 @@ TEST_F(CopresenceApiUnittest, Publish) {
}
TEST_F(CopresenceApiUnittest, Subscribe) {
- scoped_ptr<SubscribeOperation> subscribe(CreateSubscribe("sub"));
+ std::unique_ptr<SubscribeOperation> subscribe(CreateSubscribe("sub"));
subscribe->strategies.reset(new Strategy);
subscribe->strategies->only_broadcast.reset(new bool(true)); // Not default
subscribe->strategies->audible.reset(new bool(true)); // Not default
- scoped_ptr<Operation> operation(new Operation);
+ std::unique_ptr<Operation> operation(new Operation);
operation->subscribe = std::move(subscribe);
clear_app_id();
@@ -208,10 +209,10 @@ TEST_F(CopresenceApiUnittest, Subscribe) {
}
TEST_F(CopresenceApiUnittest, DefaultStrategies) {
- scoped_ptr<Operation> publish_operation(new Operation);
+ std::unique_ptr<Operation> publish_operation(new Operation);
publish_operation->publish.reset(CreatePublish("pub"));
- scoped_ptr<Operation> subscribe_operation(new Operation);
+ std::unique_ptr<Operation> subscribe_operation(new Operation);
subscribe_operation->subscribe.reset(CreateSubscribe("sub"));
ListValue* operation_list = new ListValue;
@@ -228,7 +229,7 @@ TEST_F(CopresenceApiUnittest, DefaultStrategies) {
}
TEST_F(CopresenceApiUnittest, LowPowerStrategy) {
- scoped_ptr<Operation> subscribe_operation(new Operation);
+ std::unique_ptr<Operation> subscribe_operation(new Operation);
subscribe_operation->subscribe.reset(CreateSubscribe("sub"));
subscribe_operation->subscribe->strategies.reset(new Strategy);
subscribe_operation->subscribe->strategies->low_power.reset(new bool(true));
@@ -244,8 +245,8 @@ TEST_F(CopresenceApiUnittest, LowPowerStrategy) {
TEST_F(CopresenceApiUnittest, UnPubSub) {
// First we need to create a publish and a subscribe to cancel.
- scoped_ptr<Operation> publish_operation(new Operation);
- scoped_ptr<Operation> subscribe_operation(new Operation);
+ std::unique_ptr<Operation> publish_operation(new Operation);
+ std::unique_ptr<Operation> subscribe_operation(new Operation);
publish_operation->publish.reset(CreatePublish("pub"));
subscribe_operation->subscribe.reset(CreateSubscribe("sub"));
ListValue* operation_list = new ListValue;
@@ -253,11 +254,11 @@ TEST_F(CopresenceApiUnittest, UnPubSub) {
operation_list->Append(subscribe_operation->ToValue().release());
EXPECT_TRUE(ExecuteOperations(operation_list));
- scoped_ptr<Operation> unpublish_operation(new Operation);
+ std::unique_ptr<Operation> unpublish_operation(new Operation);
unpublish_operation->unpublish.reset(new UnpublishOperation);
unpublish_operation->unpublish->unpublish_id = "pub";
- scoped_ptr<Operation> unsubscribe_operation(new Operation);
+ std::unique_ptr<Operation> unsubscribe_operation(new Operation);
unsubscribe_operation->unsubscribe.reset(new UnsubscribeOperation);
unsubscribe_operation->unsubscribe->unsubscribe_id = "sub";
@@ -280,7 +281,7 @@ TEST_F(CopresenceApiUnittest, UnPubSub) {
}
TEST_F(CopresenceApiUnittest, BadId) {
- scoped_ptr<Operation> unsubscribe_operation(new Operation);
+ std::unique_ptr<Operation> unsubscribe_operation(new Operation);
unsubscribe_operation->unsubscribe.reset(new UnsubscribeOperation);
unsubscribe_operation->unsubscribe->unsubscribe_id = "invalid id";
@@ -288,7 +289,7 @@ TEST_F(CopresenceApiUnittest, BadId) {
}
TEST_F(CopresenceApiUnittest, MultipleOperations) {
- scoped_ptr<Operation> multi_operation(new Operation);
+ std::unique_ptr<Operation> multi_operation(new Operation);
multi_operation->publish.reset(CreatePublish("pub"));
multi_operation->subscribe.reset(CreateSubscribe("sub"));

Powered by Google App Engine
This is Rietveld 408576698