window-service: test cleanup

Remove '2' from a bunch of test names. This was necessary as ws1 had similar
test names. Now that ws1 has been removed, the names no longer need '2' in them.
Also fixes minor misspelling in event.h.

BUG=none
TEST=test only/documentation changes

Change-Id: Id8133edf1d1f398157a3fb00279bc1418f58b036
Reviewed-on: https://chromium-review.googlesource.com/1159469Reviewed-by: Michael Wasserman <msw@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580046}

ui/events/event.h

@@ -211,7 +211,7 @@ class EVENTS_EXPORT Event {
   }
 
   bool IsScrollEvent() const {
-    // Flings can be GestureEvents too. EF_FROM_TOUCH determins if they're
+    // Flings can be GestureEvents too. EF_FROM_TOUCH determines if they're
     // Gesture or Scroll events.
     return type_ == ET_SCROLL ||
            ((type_ == ET_SCROLL_FLING_START ||