Merge ArcNotificationItem and ArcCustomNotificationItem

ui/arc/notification/arc_custom_notification_view.h

Index: ui/arc/notification/arc_custom_notification_view.h
diff --git a/ui/arc/notification/arc_custom_notification_view.h b/ui/arc/notification/arc_custom_notification_view.h
index 6af56841a2aab374bbb0e1994f76ae85c923d711..26585fa42c7f1f0845b49602ad28a601c7773cd8 100644
--- a/ui/arc/notification/arc_custom_notification_view.h
+++ b/ui/arc/notification/arc_custom_notification_view.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "ui/arc/notification/arc_custom_notification_item.h"
+#include "ui/arc/notification/arc_notification_item.h"
 #include "ui/arc/notification/arc_notification_surface_manager.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/animation/animation_delegate.h"
@@ -37,11 +37,11 @@ class ArcCustomNotificationView
     : public views::NativeViewHost,
       public views::ButtonListener,
       public aura::WindowObserver,
-      public ArcCustomNotificationItem::Observer,
+      public ArcNotificationItem::Observer,
       public ArcNotificationSurfaceManager::Observer,
       public gfx::AnimationDelegate {
  public:
-  explicit ArcCustomNotificationView(ArcCustomNotificationItem* item);
+  explicit ArcCustomNotificationView(ArcNotificationItem* item);
   ~ArcCustomNotificationView() override;
 
   std::unique_ptr<message_center::CustomNotificationContentViewDelegate>
@@ -104,7 +104,7 @@ class ArcCustomNotificationView
                              const gfx::Rect& new_bounds) override;
   void OnWindowDestroying(aura::Window* window) override;
 
-  // ArcCustomNotificationItem::Observer
+  // ArcNotificationItem::Observer
   void OnItemDestroying() override;
   void OnItemUpdated() override;
 
@@ -118,7 +118,7 @@ class ArcCustomNotificationView
 
   // If |item_| is null, we may be about to be destroyed. In this case,
   // we have to be careful about what we do.
-  ArcCustomNotificationItem* item_ = nullptr;
+  ArcNotificationItem* item_ = nullptr;
   exo::NotificationSurface* surface_ = nullptr;
 
   const std::string notification_key_;