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

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 449a09b73378efc8243e1416536e1fe15a2dbd10..25e9810ce5e7c2dd72c9d820760657003487d478 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -68,7 +68,7 @@ enum SriResourceIntegrityMismatchEvent {
 };
 
 #define DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, name)                        \
-  case Resource::name: {                                                      \
+  case Resource::k##name: {                                                      \
     DEFINE_THREAD_SAFE_STATIC_LOCAL(                                          \
         EnumerationHistogram, resourceHistogram,                              \
         new EnumerationHistogram(                                             \
@@ -94,6 +94,8 @@ enum SriResourceIntegrityMismatchEvent {
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, TextTrack)      \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, XSLStyleSheet)  \
   }
+  /* DO NOT SUBMIT - conflict resolution helper:
+   * Important to have XSLStyleSheet instead of kXSLStyleSheet above. */
 
 void addRedirectsToTimingInfo(Resource* resource, ResourceTimingInfo* info) {
   // Store redirect responses that were packed inside the final response.