Restore the histograms for notification resource loading.

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 "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
+#include "platform/Histogram.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "wtf/CurrentTime.h"
 
 namespace blink {
 
 NotificationImageLoader::NotificationImageLoader()
-    : m_stopped(false)
+    : m_stopped(false), m_startTime(0.0)
 {
 }
 
 NotificationImageLoader::~NotificationImageLoader()
 {
 }
 
 void NotificationImageLoader::start(ExecutionContext* executionContext, const KURL& url, PassOwnPtr<ImageCallback> imageCallback)
 {
     DCHECK(!m_stopped);
 
+    m_startTime = monotonicallyIncreasingTimeMS();
     m_imageCallback = imageCallback;
 
     // TODO(mvanouwerkerk): Add a timeout mechanism: crbug.com/579137.
     ThreadableLoaderOptions threadableLoaderOptions;
     threadableLoaderOptions.preflightPolicy = PreventPreflight;
     threadableLoaderOptions.crossOriginRequestPolicy = AllowCrossOriginRequests;
 
     // TODO(mvanouwerkerk): Add an entry for notifications to FetchInitiatorTypeNames and use it.
     ResourceLoaderOptions resourceLoaderOptions;
     resourceLoaderOptions.allowCredentials = AllowStoredCredentials;
@@ skipping 32 matching lines @@
     m_data->append(data, length);
 }
 
 void NotificationImageLoader::didFinishLoading(unsigned long resourceIdentifier, double finishTime)
 {
     // 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;
 
+    // Matches UMA_HISTOGRAM_LONG_TIMES - the way Notifications.Icon.LoadFinishTime was originally defined.

[Peter Beverloo, 2016/04/22 15:56:13]

Here and elsewhere -
  "the way Notifications.Icon.LoadFinishTime was originally defined."

I think these comments are more valuable in the CL description than in the code.
From the code's point of view, it doesn't matter where or how it originally was
defined.

[Michael van Ouwerkerk, 2016/04/25 11:28:28]

Done.

+    DEFINE_STATIC_LOCAL(CustomCountHistogram, finishedTimeHistogram, ("Notifications.Icon.LoadFinishTime", 1, 1000 * 60 * 60 /* 1 hour max */, 50 /* buckets */));
+    finishedTimeHistogram.count(monotonicallyIncreasingTimeMS() - m_startTime);
+
     if (m_data) {
+        DEFINE_STATIC_LOCAL(CustomCountHistogram, fileSizeHistogram, ("Notifications.Icon.FileSize", 1, 10000000 /* ~10mb max */, 50 /* buckets */));
+        fileSizeHistogram.count(m_data->size());
+
         OwnPtr<ImageDecoder> decoder = ImageDecoder::create(*m_data.get(), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
         if (decoder) {
             decoder->setData(m_data.get(), true /* allDataReceived */);
             // The |ImageFrame*| is owned by the decoder.
             ImageFrame* imageFrame = decoder->frameBufferAtIndex(0);
             if (imageFrame) {
                 (*m_imageCallback)(imageFrame->bitmap());
                 return;
             }
         }
     }
     runCallbackWithEmptyBitmap();
 }
 
 void NotificationImageLoader::didFail(const ResourceError& error)
 {
+    // Matches UMA_HISTOGRAM_LONG_TIMES - the way Notifications.Icon.LoadFailTime was originally defined.
+    DEFINE_STATIC_LOCAL(CustomCountHistogram, failedTimeHistogram, ("Notifications.Icon.LoadFailTime", 1, 1000 * 60 * 60 /* 1 hour max */, 50 /* buckets */));
+    failedTimeHistogram.count(monotonicallyIncreasingTimeMS() - m_startTime);
+
     runCallbackWithEmptyBitmap();
 }
 
 void NotificationImageLoader::didFailRedirectCheck()
 {
     runCallbackWithEmptyBitmap();
 }
 
 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