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

Unified Diff: chrome/browser/extensions/api/copresence/copresence_translations.cc

Issue 1828683002: [Extensions] Convert APIs to use movable types [3] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Antony's Created 4 years, 9 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_translations.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_translations.cc b/chrome/browser/extensions/api/copresence/copresence_translations.cc
index 779040ef2315855a31f86a020238f56b9cf0b85d..3537e2cd99b0afd3391037c46d51713f7f22df1a 100644
--- a/chrome/browser/extensions/api/copresence/copresence_translations.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_translations.cc
@@ -197,37 +197,33 @@ bool AddUnsubscribeToRequest(const std::string& app_id,
return true;
}
-bool PrepareReportRequestProto(
- const std::vector<linked_ptr<Operation>>& operations,
- const std::string& app_id,
- SubscriptionToAppMap* apps_by_subscription_id,
- ReportRequest* request) {
- for (const linked_ptr<Operation>& op : operations) {
- DCHECK(op.get());
-
+bool PrepareReportRequestProto(const std::vector<Operation>& operations,
+ const std::string& app_id,
+ SubscriptionToAppMap* apps_by_subscription_id,
+ ReportRequest* request) {
+ for (const Operation& op : operations) {
// Verify our object has exactly one operation.
- if (static_cast<int>(op->publish != nullptr) +
- static_cast<int>(op->subscribe != nullptr) +
- static_cast<int>(op->unpublish != nullptr) +
- static_cast<int>(op->unsubscribe != nullptr) != 1) {
+ if (static_cast<int>(op.publish != nullptr) +
+ static_cast<int>(op.subscribe != nullptr) +
+ static_cast<int>(op.unpublish != nullptr) +
+ static_cast<int>(op.unsubscribe != nullptr) !=
+ 1) {
return false;
}
- if (op->publish) {
- if (!AddPublishToRequest(app_id, *(op->publish), request))
+ if (op.publish) {
+ if (!AddPublishToRequest(app_id, *(op.publish), request))
return false;
- } else if (op->subscribe) {
- if (!AddSubscribeToRequest(
- app_id, *(op->subscribe), apps_by_subscription_id, request))
+ } else if (op.subscribe) {
+ if (!AddSubscribeToRequest(app_id, *(op.subscribe),
+ apps_by_subscription_id, request))
return false;
- } else if (op->unpublish) {
- if (!AddUnpublishToRequest(op->unpublish->unpublish_id, request))
+ } else if (op.unpublish) {
+ if (!AddUnpublishToRequest(op.unpublish->unpublish_id, request))
return false;
- } else { // if (op->unsubscribe)
- if (!AddUnsubscribeToRequest(app_id,
- op->unsubscribe->unsubscribe_id,
- apps_by_subscription_id,
- request))
+ } else { // if (op.unsubscribe)
+ if (!AddUnsubscribeToRequest(app_id, op.unsubscribe->unsubscribe_id,
+ apps_by_subscription_id, request))
return false;
}
}

Powered by Google App Engine
This is Rietveld 408576698