Merge "Make ChangeControl#isOwner private"

gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java

@@ -315,7 +315,7 @@ public class ChangeControl {
   }
 
   /** Is this user the owner of the change? */
-  boolean isOwner() {
+  private boolean isOwner() {
     if (getUser().isIdentifiedUser()) {
       Account.Id id = getUser().asIdentifiedUser().getAccountId();
       return id.equals(getChange().getOwner());

gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java

@@ -87,7 +87,9 @@ public class RemoveReviewerControl {
       }
     }
     // The change owner may remove any zero or positive score.
-    if (changeControl.isOwner() && 0 <= value) {
+    if (currentUser.isIdentifiedUser()
+        && currentUser.getAccountId().equals(notes.getChange().getOwner())
+        && 0 <= value) {
       return true;
     }
     // Users with the remove reviewer permission, the branch owner, project