Simplify LifecycleNotifier and Observer.

third_party/WebKit/Source/platform/LifecycleContextTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "platform/heap/Handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class TestingObserver;
 
 class DummyContext final : public GarbageCollectedFinalized<DummyContext>, public LifecycleNotifier<DummyContext, TestingObserver> {
     USING_GARBAGE_COLLECTED_MIXIN(DummyContext);
 public:
-    static RawPtr<DummyContext> create()
+    static DummyContext* create()
     {
-        return new DummyContext();
+        return new DummyContext;
     }
 
     DEFINE_INLINE_TRACE()
     {
         LifecycleNotifier<DummyContext, TestingObserver>::trace(visitor);
     }
 };
 
 class TestingObserver final : public GarbageCollectedFinalized<TestingObserver>, public LifecycleObserver<DummyContext, TestingObserver, DummyContext> {
     USING_GARBAGE_COLLECTED_MIXIN(TestingObserver);
 public:
-    static RawPtr<TestingObserver> create(DummyContext* context)
+    static TestingObserver* create(DummyContext* context)
     {
         return new TestingObserver(context);
     }
 
     void contextDestroyed() override
     {
         LifecycleObserver::contextDestroyed();
         if (m_observerToRemoveOnDestruct) {
-            lifecycleContext()->removeObserver(m_observerToRemoveOnDestruct.get());
+            lifecycleContext()->removeObserver(m_observerToRemoveOnDestruct);
             m_observerToRemoveOnDestruct.clear();
         }
         m_contextDestroyedCalled = true;
     }
 
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_observerToRemoveOnDestruct);
         LifecycleObserver::trace(visitor);
     }
 
     void unobserve() { setContext(nullptr); }
 
-    void setObserverToRemoveAndDestroy(RawPtr<TestingObserver> observerToRemoveOnDestruct)
+    void setObserverToRemoveAndDestroy(TestingObserver* observerToRemoveOnDestruct)
     {
         ASSERT(!m_observerToRemoveOnDestruct);
         m_observerToRemoveOnDestruct = observerToRemoveOnDestruct;
     }
 
-    TestingObserver* innerObserver() const { return m_observerToRemoveOnDestruct.get(); }
+    TestingObserver* innerObserver() const { return m_observerToRemoveOnDestruct; }
     bool contextDestroyedCalled() const { return m_contextDestroyedCalled; }
 
 private:
     explicit TestingObserver(DummyContext* context)
         : LifecycleObserver(context)
         , m_contextDestroyedCalled(false)
     {
     }
 
     Member<TestingObserver> m_observerToRemoveOnDestruct;
     bool m_contextDestroyedCalled;
 };
 
 TEST(LifecycleContextTest, shouldObserveContextDestroyed)
 {
-    RawPtr<DummyContext> context = DummyContext::create();
-    Persistent<TestingObserver> observer = TestingObserver::create(context.get());
+    DummyContext* context = DummyContext::create();
+    Persistent<TestingObserver> observer = TestingObserver::create(context);
 
-    EXPECT_EQ(observer->lifecycleContext(), context.get());
+    EXPECT_EQ(observer->lifecycleContext(), context);
     EXPECT_FALSE(observer->contextDestroyedCalled());
     context->notifyContextDestroyed();
     context = nullptr;
     Heap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_TRUE(observer->contextDestroyedCalled());
 }
 
 TEST(LifecycleContextTest, shouldNotObserveContextDestroyedIfUnobserve)
 {
-    RawPtr<DummyContext> context = DummyContext::create();
-    Persistent<TestingObserver> observer = TestingObserver::create(context.get());
+    DummyContext* context = DummyContext::create();
+    Persistent<TestingObserver> observer = TestingObserver::create(context);
     observer->unobserve();
     context->notifyContextDestroyed();
     context = nullptr;
     Heap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_FALSE(observer->contextDestroyedCalled());
 }
 
 TEST(LifecycleContextTest, observerRemovedDuringNotifyDestroyed)
 {
-    // FIXME: Oilpan: this test can be removed when the LifecycleNotifier<T>::m_observers
-    // hash set is on the heap and membership is handled implicitly by the garbage collector.
-    RawPtr<DummyContext> context = DummyContext::create();
-    Persistent<TestingObserver> observer = TestingObserver::create(context.get());
-    RawPtr<TestingObserver> innerObserver = TestingObserver::create(context.get());
+    DummyContext* context = DummyContext::create();
+    Persistent<TestingObserver> observer = TestingObserver::create(context);
+    TestingObserver* innerObserver = TestingObserver::create(context);
     // Attach the observer to the other. When 'observer' is notified
     // of destruction, it will remove & destroy 'innerObserver'.
-    observer->setObserverToRemoveAndDestroy(innerObserver.release());
+    observer->setObserverToRemoveAndDestroy(innerObserver);
 
-    EXPECT_EQ(observer->lifecycleContext(), context.get());
-    EXPECT_EQ(observer->innerObserver()->lifecycleContext(), context.get());
+    EXPECT_EQ(observer->lifecycleContext(), context);
+    EXPECT_EQ(observer->innerObserver()->lifecycleContext(), context);
     EXPECT_FALSE(observer->contextDestroyedCalled());
     EXPECT_FALSE(observer->innerObserver()->contextDestroyedCalled());
 
     context->notifyContextDestroyed();
     EXPECT_EQ(observer->innerObserver(), nullptr);
     context = nullptr;
     Heap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_TRUE(observer->contextDestroyedCalled());
 }
 
 } // namespace blink