Add unittest for ArcNotificationContentView

ui/arc/notification/arc_notification_surface_manager_impl.cc

Index: ui/arc/notification/arc_notification_surface_manager_impl.cc
diff --git a/ui/arc/notification/arc_notification_surface_manager_impl.cc b/ui/arc/notification/arc_notification_surface_manager_impl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0c8d3e7d36554452b3c32ea0134d80ad68694b11
--- /dev/null
+++ b/ui/arc/notification/arc_notification_surface_manager_impl.cc
@@ -0,0 +1,70 @@
+// Copyright 2017 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 "ui/arc/notification/arc_notification_surface_manager_impl.h"
+
+#include <string>
+#include <utility>
+
+#include "base/memory/ptr_util.h"
+#include "components/exo/notification_surface.h"
+#include "ui/arc/notification/arc_notification_surface_impl.h"
+
+namespace arc {
+
+ArcNotificationSurfaceManagerImpl::ArcNotificationSurfaceManagerImpl() {}

[hidehiko, 2017/06/15 15:26:21]

nit: s/{}/= default;/ please for consistency. (Please see ARC's style guide).

[yoshiki, 2017/06/16 11:29:08]

Done.

+
+ArcNotificationSurfaceManagerImpl::~ArcNotificationSurfaceManagerImpl() {}
+
+ArcNotificationSurface* ArcNotificationSurfaceManagerImpl::GetArcSurface(
+    const std::string& notification_key) const {
+  auto it = notification_surface_map_.find(notification_key);
+  return it == notification_surface_map_.end() ? nullptr : it->second.get();
+}
+
+void ArcNotificationSurfaceManagerImpl::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void ArcNotificationSurfaceManagerImpl::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+exo::NotificationSurface* ArcNotificationSurfaceManagerImpl::GetSurface(
+    const std::string& notification_key) const {
+  auto it = notification_surface_map_.find(notification_key);

[hidehiko, 2017/06/15 15:26:21]

nit/optional: you can avoid dup code?
ArcNotificationSurface* arc_surface = GetArcSurface(notification_key);
return arc_surface == nullptr ? nullptr : arc_surface->surface();

[yoshiki, 2017/06/16 11:29:08]

ArcNotificationSurface class doesn't have surface() method, so we can't use the
result of GetArcSurface(). Of course, casting should be safe here, but I don't
want to use it here.

+  return it == notification_surface_map_.end() ? nullptr
+                                               : it->second->surface();
+}
+
+void ArcNotificationSurfaceManagerImpl::AddSurface(
+    exo::NotificationSurface* surface) {
+  if (notification_surface_map_.find(surface->notification_key()) !=

[hidehiko, 2017/06/15 15:26:21]

Can you use

auto result = map::insert(...);
if (!result.second) {
  NOTREACHED();
  return;
}

[yoshiki, 2017/06/16 11:29:08]

Done.

+      notification_surface_map_.end()) {
+    NOTREACHED();
+    return;
+  }
+
+  notification_surface_map_[surface->notification_key()] =
+      base::MakeUnique<ArcNotificationSurfaceImpl>(surface);
+
+  for (auto& observer : observers_) {
+    observer.OnNotificationSurfaceAdded(
+        notification_surface_map_[surface->notification_key()].get());

[hidehiko, 2017/06/15 15:26:21]

Let's avoid searching map repeatedly.

[yoshiki, 2017/06/16 11:29:09]

Done.

+  }
+}
+
+void ArcNotificationSurfaceManagerImpl::RemoveSurface(
+    exo::NotificationSurface* surface) {
+  auto it = notification_surface_map_.find(surface->notification_key());
+  if (it == notification_surface_map_.end())
+    return;
+
+  auto arc_surface = std::move(it->second);
+  notification_surface_map_.erase(it);
+  for (auto& observer : observers_)
+    observer.OnNotificationSurfaceRemoved(arc_surface.get());
+}
+
+}  // namespace arc