1 files changed, 15 insertions, 11 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SingleGroupUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SingleGroupUser.java
index 2fb6694fa0..cdce217240 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SingleGroupUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SingleGroupUser.java
@@ -14,31 +14,35 @@
 
 package com.google.gerrit.server.query.change;
 
-import com.google.gerrit.reviewdb.AccountGroup;
-import com.google.gerrit.reviewdb.AccountProjectWatch;
-import com.google.gerrit.reviewdb.Change;
+import com.google.gerrit.reviewdb.client.AccountGroup;
+import com.google.gerrit.reviewdb.client.AccountProjectWatch;
+import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.server.AccessPath;
 import com.google.gerrit.server.CurrentUser;
-import com.google.gerrit.server.config.AuthConfig;
+import com.google.gerrit.server.account.CapabilityControl;
+import com.google.gerrit.server.account.GroupMembership;
+import com.google.gerrit.server.account.ListGroupMembership;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 
 final class SingleGroupUser extends CurrentUser {
-  private final Set<AccountGroup.Id> groups;
+  private final GroupMembership groups;
 
-  SingleGroupUser(AuthConfig authConfig, AccountGroup.Id groupId) {
-    this(authConfig, Collections.singleton(groupId));
+  SingleGroupUser(CapabilityControl.Factory capabilityControlFactory,
+      AccountGroup.UUID groupId) {
+    this(capabilityControlFactory, Collections.singleton(groupId));
   }
 
-  SingleGroupUser(AuthConfig authConfig, Set<AccountGroup.Id> groups) {
-    super(AccessPath.UNKNOWN, authConfig);
-    this.groups = groups;
+  SingleGroupUser(CapabilityControl.Factory capabilityControlFactory,
+      Set<AccountGroup.UUID> groups) {
+    super(capabilityControlFactory, AccessPath.UNKNOWN);
+    this.groups = new ListGroupMembership(groups);
   }
 
   @Override
-  public Set<AccountGroup.Id> getEffectiveGroups() {
+  public GroupMembership getEffectiveGroups() {
     return groups;
   }