Fix: test compile errors

psiphon/controller_test.go

@@ -599,7 +599,7 @@ func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
 		t.Fatalf("error initializing datastore: %s", err)
 	}
 
-	serverEntryCount := CountServerEntries("", nil)
+	serverEntryCount := CountServerEntries(config.UseUpstreamProxy(), "", nil)
 
 	if runConfig.expectNoServerEntries && serverEntryCount > 0 {
 		// TODO: replace expectNoServerEntries with resetServerEntries

psiphon/remoteServerList_test.go

@@ -213,7 +213,7 @@ func testObfuscatedRemoteServerLists(t *testing.T, omitMD5Sums bool) {
 		t.Fatalf("error initializing client datastore: %s", err)
 	}
 
-	if CountServerEntries("", nil) > 0 {
+	if CountServerEntries(false, "", nil) > 0 {
 		t.Fatalf("unexpected server entries")
 	}