| Index: services/resource_coordinator/public/cpp/coordination_unit_id.h
|
| diff --git a/services/resource_coordinator/public/cpp/coordination_unit_id.h b/services/resource_coordinator/public/cpp/coordination_unit_id.h
|
| index a14579993f786d97c831821e88144176493bff22..71e9612ea0e88853ccd728f16572f82bb7cab5a0 100644
|
| --- a/services/resource_coordinator/public/cpp/coordination_unit_id.h
|
| +++ b/services/resource_coordinator/public/cpp/coordination_unit_id.h
|
| @@ -14,22 +14,16 @@
|
| // This is a native struct rather than a mojom struct as we eventually want
|
| // to annotate base::TaskRunner with CUs for cost attribution purses and
|
| // would like to move it to base/ as easily as possible at that point.
|
| -// TODO(oysteine): Rename to CoordinationUnitGUID to better differentiate the
|
| -// class from the internal id
|
| struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT CoordinationUnitID {
|
| - typedef uint64_t CoordinationUnitTypeId;
|
| -
|
| CoordinationUnitID();
|
| CoordinationUnitID(const CoordinationUnitType& type,
|
| const std::string& new_id);
|
| - CoordinationUnitID(const CoordinationUnitType& type,
|
| - CoordinationUnitTypeId new_id);
|
|
|
| bool operator==(const CoordinationUnitID& b) const {
|
| return id == b.id && type == b.type;
|
| }
|
|
|
| - CoordinationUnitTypeId id;
|
| + int64_t id;
|
| CoordinationUnitType type;
|
| };
|
|
|
| @@ -41,8 +35,7 @@
|
| struct hash<resource_coordinator::CoordinationUnitID> {
|
| uint64_t operator()(
|
| const resource_coordinator::CoordinationUnitID& id) const {
|
| - return ((static_cast<uint64_t>(id.type)) << 32) |
|
| - static_cast<uint64_t>(id.id);
|
| + return ((static_cast<uint64_t>(id.type)) << 32) | id.id;
|
| }
|
| };
|
|
|
|
|