Adding UMA for persistent notifications.

chrome/browser/notifications/platform_notification_service_impl.cc

 // Copyright 2014 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 "chrome/browser/notifications/platform_notification_service_impl.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/browser/platform_notification_context.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/browser/user_metrics.h"
 #include "content/public/common/platform_notification_data.h"
 #include "net/base/net_util.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/url_constants.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #endif
 
-#if defined(OS_ANDROID)
 #include "base/strings/string_number_conversions.h"
-#endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::PlatformNotificationContext;
 using message_center::NotifierId;
 
 namespace {
 
 // Callback to provide when deleting the data associated with persistent Web
 // Notifications from the notification database.
 void OnPersistentNotificationDataDeleted(bool success) {
-  // TODO(peter): Record UMA for notification deletion requests created by the
-  // PlatformNotificationService.
+  content::RecordAction(

[Peter Beverloo, 2015/05/21 11:33:10]

I was thinking of using a UMA_HISTOGRAM_BOOLEAN() here, since capturing the
|success| state is important. We don't care about *how often* these events
happen, but we do care about their success rate.

Dito on lines 61-62.

[Deepak, 2015/05/21 14:37:02]

Done.

+      base::UserMetricsAction("PersistentNotificationDataDeleted"));
 }
 
 // Persistent notifications fired through the delegate do not care about the
 // lifetime of the Service Worker responsible for executing the event.
 void OnEventDispatchComplete(content::PersistentNotificationStatus status) {
-  // TODO(peter): Record UMA statistics about the result status of running
-  // events for persistent Web Notifications.
+  content::RecordAction(
+      base::UserMetricsAction("PersistentWebNotificationComplete"));
 }
 
 void CancelNotification(const std::string& id, ProfileID profile_id) {
   PlatformNotificationServiceImpl::GetInstance()
       ->GetNotificationUIManager()->CancelById(id, profile_id);
 }
 
 }  // namespace
 
 // static
@@ skipping 235 matching lines @@
 bool PlatformNotificationServiceImpl::GetDisplayedPersistentNotifications(
     BrowserContext* browser_context,
     std::set<std::string>* displayed_notifications) {
   DCHECK(displayed_notifications);
 
 #if !defined(OS_ANDROID)
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile || profile->AsTestingProfile())
     return false;  // Tests will not have a message center.
 
-  // TODO(peter): Filter for persistent notifications only.
-  *displayed_notifications =
+  std::set<std::string> persistent_notifications;

[Peter Beverloo, 2015/05/21 11:33:10]

Please let this TODO be for now, I'm working on a better way to identify those,
which comes with large improvements in the way how we route this.

+  std::set<std::string> all_notifications =
       GetNotificationUIManager()->GetAllIdsByProfile(profile);
-
+  for (std::set<std::string>::iterator itr_notification =
+           all_notifications.begin();
+       itr_notification != all_notifications.end(); itr_notification++) {
+    int64_t id;
+    if (base::StringToInt64(*itr_notification, &id) &&
+        persistent_notifications_.find(id) != persistent_notifications_.end()) {
+      persistent_notifications.insert(*itr_notification);
+    }
+  }
+  *displayed_notifications = persistent_notifications;
   return true;
 #else
   // Android cannot reliably return the notifications that are currently being
   // displayed on the platform, see the comment in NotificationUIManagerAndroid.
   return false;
 #endif  // !defined(OS_ANDROID)
 }
 
 Notification PlatformNotificationServiceImpl::CreateNotificationFromData(
     Profile* profile,
@@ skipping 74 matching lines @@
       formatted_origin.push_back(':');
       formatted_origin.append(base::UTF8ToUTF16(origin.port()));
     }
     return formatted_origin;
   }
 
   // TODO(dewittj): Once file:// URLs are passed in to the origin
   // GURL here, begin returning the path as the display name.
   return net::FormatUrl(origin, languages);
 }