Migrate extension notifications to the new NotificationDisplayService

chrome/browser/notifications/native_notification_display_service.cc

 // 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 "chrome/browser/notifications/native_notification_display_service.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/notifications/extension_notification_handler.h"

[Miguel Garcia, 2017/02/21 10:56:44]

yeah I can see how this include is not great...

And even worse now that I see the trybots since we don't link to the api code on
android. Shall we talk about it?

[Peter Beverloo, 2017/02/21 17:23:50]

Sure. Fixed for now.

 #include "chrome/browser/notifications/non_persistent_notification_handler.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_handler.h"
 #include "chrome/browser/notifications/notification_platform_bridge.h"
 #include "chrome/browser/notifications/persistent_notification_handler.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace {
 
@@ skipping 13 matching lines @@
     Profile* profile,
     NotificationPlatformBridge* notification_bridge)
     : profile_(profile), notification_bridge_(notification_bridge) {
   DCHECK(profile_);
   DCHECK(notification_bridge_);
 
   AddNotificationHandler(NotificationCommon::NON_PERSISTENT,
                          base::MakeUnique<NonPersistentNotificationHandler>());
   AddNotificationHandler(NotificationCommon::PERSISTENT,
                          base::MakeUnique<PersistentNotificationHandler>());
+  AddNotificationHandler(NotificationCommon::EXTENSION,
+                         base::MakeUnique<ExtensionNotificationHandler>());
 }
 
 NativeNotificationDisplayService::~NativeNotificationDisplayService() {}
 
 void NativeNotificationDisplayService::Display(
     NotificationCommon::Type notification_type,
     const std::string& notification_id,
     const Notification& notification) {
   notification_bridge_->Display(notification_type, notification_id,
                                 GetProfileId(profile_),
@@ skipping 57 matching lines @@
   notification_handlers_.erase(notification_type);
 }
 
 NotificationHandler* NativeNotificationDisplayService::GetNotificationHandler(
     NotificationCommon::Type notification_type) {
   DCHECK(notification_handlers_.find(notification_type) !=
          notification_handlers_.end())
       << notification_type << " is not registered.";
   return notification_handlers_[notification_type].get();
 }