Well, I took the effort to check up what "pacifist" means and, according to Google, it means "a person who believes that war and violence are unjustifiable."
So I think both types are pacifists, since they probably both believe that violence shouldn't be justified.
Unless they both believe in self-defense.. Even then it's arguable whether or not self-defense is violent, but I digress...
On the other hand, if we define "pacifist" as "a person who does not choose violence as a means", then I think it would be the latter, depending on how we define the word "choose" and what it means to "not choose".
Of course, it could be like what DakotaStanley23 said: a person who lives in the Pacific ;-)