Merge "Delete: Use hasSuperproject to check"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
index e5df5a3..a444859 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
@@ -25,7 +25,7 @@
 import org.kohsuke.args4j.Option;
 
 @CommandMetaData(name = "delete", description = "Delete specific project")
-public final class DeleteCommand extends SshCommand {
+final class DeleteCommand extends SshCommand {
   private static final String FORCE_DELETE =
       "%s - To really delete '%s', re-run with the --force flag.";
   private static final String REALLY_DELETE =
@@ -50,7 +50,7 @@
   private final DeletePreconditions preConditions;
 
   @Inject
-  protected DeleteCommand(DeleteProject deleteProject, DeletePreconditions preConditions) {
+  DeleteCommand(DeleteProject deleteProject, DeletePreconditions preConditions) {
     this.deleteProject = deleteProject;
     this.preConditions = preConditions;
   }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/TimeMachine.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/TimeMachine.java
index c4fe5c0..53241ac 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/TimeMachine.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/TimeMachine.java
@@ -26,7 +26,8 @@
  */
 public class TimeMachine {
 
-  private static Clock clock = Clock.systemDefaultZone();
+  private static ZoneId PACIFIC_TIME_ZONE = ZoneId.of("America/Los_Angeles");
+  private static Clock clock = Clock.system(PACIFIC_TIME_ZONE);
 
   /**
    * Obtain the current instant on the time-line from the system clock using the system default time
@@ -45,12 +46,12 @@
    */
   @VisibleForTesting
   public static void useFixedClockAt(Instant instant) {
-    clock = Clock.fixed(instant, ZoneId.systemDefault());
+    clock = Clock.fixed(instant, PACIFIC_TIME_ZONE);
   }
 
-  /** Reset the clock to be the system default. */
+  /** Reset the clock to be the system PCT. */
   @VisibleForTesting
-  public static void useSystemDefaultZoneClock() {
-    clock = Clock.systemDefaultZone();
+  public static void useSystemPctZoneClock() {
+    clock = Clock.system(PACIFIC_TIME_ZONE);
   }
 }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemoverTest.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemoverTest.java
index 64634b9..e94390c 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemoverTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/fs/ArchiveRepositoryRemoverTest.java
@@ -101,7 +101,7 @@
                   PLUGIN_NAME, archiveRepo));
       assertDirectoryContents(archiveRepo, true);
     } finally {
-      TimeMachine.useSystemDefaultZoneClock();
+      TimeMachine.useSystemPctZoneClock();
     }
   }