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

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 50 matching lines @@
 
 // Events for UMA. Do not reorder or delete. Add new events at the end, but
 // before SriResourceIntegrityMismatchEventCount.
 enum SriResourceIntegrityMismatchEvent {
   CheckingForIntegrityMismatch = 0,
   RefetchDueToIntegrityMismatch = 1,
   SriResourceIntegrityMismatchEventCount
 };
 
 #define DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, name)                        \
-  case Resource::name: {                                                      \
+  case Resource::k##name: {                                                      \
     DEFINE_THREAD_SAFE_STATIC_LOCAL(                                          \
         EnumerationHistogram, resourceHistogram,                              \
         new EnumerationHistogram(                                             \
             "Blink.MemoryCache.RevalidationPolicy." prefix #name, Load + 1)); \
     resourceHistogram.count(policy);                                          \
     break;                                                                    \
   }
 
 #define DEFINE_RESOURCE_HISTOGRAM(prefix)                    \
   switch (factory.type()) {                                  \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, CSSStyleSheet)  \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Font)           \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Image)          \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, ImportResource) \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, LinkPrefetch)   \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, MainResource)   \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Manifest)       \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Media)          \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Mock)           \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Raw)            \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, Script)         \
     DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, SVGDocument)    \
     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.
   const auto& responses = resource->response().redirectResponses();
   for (size_t i = 0; i < responses.size(); ++i) {
     const KURL& newURL = i + 1 < responses.size()
                              ? KURL(responses[i + 1].url())
                              : resource->resourceRequest().url();
     bool crossOrigin =
         !SecurityOrigin::areSameSchemeHostPort(responses[i].url(), newURL);
@@ skipping 1395 matching lines @@
   visitor->trace(m_context);
   visitor->trace(m_archive);
   visitor->trace(m_loaders);
   visitor->trace(m_nonBlockingLoaders);
   visitor->trace(m_documentResources);
   visitor->trace(m_preloads);
   visitor->trace(m_resourceTimingInfoMap);
 }
 
 }  // namespace blink