ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/web/WebInputEvent.cpp

Index: third_party/WebKit/Source/web/WebInputEvent.cpp
diff --git a/third_party/WebKit/Source/web/WebInputEvent.cpp b/third_party/WebKit/Source/web/WebInputEvent.cpp
index ac01696152f6974aebc7320d13395463237aa5a1..1a0cfa3d176883bf80df2356fb5e440bfb254210 100644
--- a/third_party/WebKit/Source/web/WebInputEvent.cpp
+++ b/third_party/WebKit/Source/web/WebInputEvent.cpp
@@ -80,11 +80,13 @@ static_assert(sizeof(WebTouchEvent) == sizeof(SameSizeAsWebTouchEvent),
               "WebTouchEvent should not have gaps");
 
 #define CASE_TYPE(t)     \
-  case WebInputEvent::t: \
+  case WebInputEvent::k##t: \
     return #t
 // static
 const char* WebInputEvent::GetName(WebInputEvent::Type type) {
   switch (type) {
+    /* DO NOT SUBMIT - Conflict resolution helper:
+     * important to use Undefined, rather than kUndefined below. */
     CASE_TYPE(Undefined);
     CASE_TYPE(MouseDown);
     CASE_TYPE(MouseUp);
@@ -119,6 +121,8 @@ const char* WebInputEvent::GetName(WebInputEvent::Type type) {
     CASE_TYPE(TouchEnd);
     CASE_TYPE(TouchCancel);
     CASE_TYPE(TouchScrollStarted);
+    /* DO NOT SUBMIT - Conflict resolution helper:
+     * important to use TouchScrollStarted, rather than kTouchSc... above. */
     default:
       NOTREACHED();
       return "";