Notifications: Split up image loading histograms by image type

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

 // Copyright 2016 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/MemoryCache.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/testing/TestingPlatformSupport.h"
@@ skipping 17 matching lines @@
 // This mirrors the definition in NotificationImageLoader.cpp.
 const unsigned long kImageFetchTimeoutInMs = 90000;
 
 static_assert(kImageFetchTimeoutInMs > 1000.0,
               "kImageFetchTimeoutInMs must be greater than 1000ms.");
 
 class NotificationImageLoaderTest : public ::testing::Test {
  public:
   NotificationImageLoaderTest()
       : m_page(DummyPageHolder::create()),
-        m_loader(new NotificationImageLoader()) {}
+        // The type is only for UMA, so not interesting to test.
+        m_loader(
+            new NotificationImageLoader(NotificationImageLoader::Type::Icon)) {}

[Peter Beverloo, 2016/11/30 17:44:02]

ISTM that testing that the right histogram is used is a fair use-case. Note that
we have a blink::HistogramTester now.

[johnme, 2016/11/30 19:08:36]

Done.

 
   ~NotificationImageLoaderTest() override {
     m_loader->stop();
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     memoryCache()->evictResources();
   }
 
   // Registers a mocked URL. When fetched it will be loaded form the test data
   // directory.
   WebURL registerMockedURL(const String& fileName) {
@@ skipping 48 matching lines @@
 
   // Now advance time until a timeout should be expected.
   testingPlatform.runForPeriodSeconds(2);
 
   // If the loader times out, it calls the callback and returns an empty bitmap.
   EXPECT_EQ(LoadState::kLoadFailed, loaded());
 }
 
 }  // namspace
 }  // namespace blink