ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/notifications/NotificationImageLoader.h"
 
 #include <memory>
 #include "core/dom/ExecutionContext.h"
 #include "platform/Histogram.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/loader/fetch/ResourceError.h"
 #include "platform/loader/fetch/ResourceLoadPriority.h"
 #include "platform/loader/fetch/ResourceLoaderOptions.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/modules/notifications/WebNotificationConstants.h"
 #include "skia/ext/image_operations.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/Threading.h"
 
 #define NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, type_name, value, max) \
-  case NotificationImageLoader::Type::type_name: {                            \
+  case NotificationImageLoader::Type::k##type_name: {                         \
     DEFINE_THREAD_SAFE_STATIC_LOCAL(                                          \
         CustomCountHistogram, metric##type_name##Histogram,                   \
         new CustomCountHistogram("Notifications." #metric "." #type_name,     \
                                  1 /* min */, max, 50 /* buckets */));        \
     metric##type_name##Histogram.count(value);                                \
     break;                                                                    \
   }
 
 #define NOTIFICATION_HISTOGRAM_COUNTS(metric, type, value, max)            \
+  /* DO NOT SUBMIT - conflict resolution helper:
+   * Important to have Image instead of kImage below. */
   switch (type) {                                                          \
     NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, Image, value, max)      \
     NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, Icon, value, max)       \
     NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, Badge, value, max)      \
+  /* DO NOT SUBMIT - conflict resolution helper:
+   * Important to have ActionIcon instead of kActionIcon below. */
     NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, ActionIcon, value, max) \
   }
 
 namespace {
 
 // 99.9% of all images were fetched successfully in 90 seconds.
 const unsigned long kImageFetchTimeoutInMs = 90000;
 
 }  // namespace
 
@@ skipping 140 matching lines @@
 void NotificationImageLoader::runCallbackWithEmptyBitmap() {
   // If this has been stopped it is not desirable to trigger further work,
   // there is a shutdown of some sort in progress.
   if (m_stopped)
     return;
 
   (*m_imageCallback)(SkBitmap());
 }
 
 }  // namespace blink