Add unit tests for ArcBridgeService::RemoveObserver()

components/arc/arc_bridge_service_unittest.cc

 // Copyright 2015 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 <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_bridge_service_impl.h"
 #include "components/arc/test/fake_arc_bridge_bootstrap.h"
 #include "components/arc/test/fake_arc_bridge_instance.h"
 #include "ipc/mojo/scoped_ipc_support.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace arc {
 
+namespace {
+
 class ArcBridgeTest : public testing::Test, public ArcBridgeService::Observer {
  public:
   ArcBridgeTest() : ready_(false) {}
   ~ArcBridgeTest() override {}
 
   void OnStateChanged(ArcBridgeService::State state) override {
     state_ = state;
     switch (state) {
       case ArcBridgeService::State::READY:
         ready_ = true;
@@ skipping 17 matching lines @@
 
  private:
   void SetUp() override {
     chromeos::DBusThreadManager::Initialize();
 
     ready_ = false;
     state_ = ArcBridgeService::State::STOPPED;
 
     instance_.reset(new FakeArcBridgeInstance());
     service_.reset(new ArcBridgeServiceImpl(
-        base::WrapUnique(new FakeArcBridgeBootstrap(instance_.get()))));
+        base::MakeUnique<FakeArcBridgeBootstrap>(instance_.get())));
 
     service_->AddObserver(this);
   }
 
   void TearDown() override {
     service_->RemoveObserver(this);
     instance_.reset();
     service_.reset();
 
     chromeos::DBusThreadManager::Shutdown();
   }
 
   bool ready_;
   ArcBridgeService::State state_;
   base::MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeTest);
 };
 
+class DummyObserver : public ArcBridgeService::Observer {};
+
+}  // namespace
+
 // Exercises the basic functionality of the ARC Bridge Service.  A message from
 // within the instance should cause the observer to be notified.
 TEST_F(ArcBridgeTest, Basic) {
   ASSERT_FALSE(ready());
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 
   service_->SetAvailable(true);
   service_->HandleStartup();
   instance_->WaitForInitCall();
   ASSERT_EQ(ArcBridgeService::State::READY, state());
@@ skipping 42 matching lines @@
   service_->DisableReconnectDelayForTesting();
   service_->OnChannelClosed();
   instance_->WaitForInitCall();
   ASSERT_EQ(ArcBridgeService::State::READY, state());
   ASSERT_EQ(2, instance_->init_calls());
 
   service_->Shutdown();
   ASSERT_EQ(ArcBridgeService::State::STOPPED, state());
 }
 
+// Removing the same observer more than once should be okay.
+TEST_F(ArcBridgeTest, RemoveObserverTwice) {
+  ASSERT_FALSE(ready());
+  service_->RemoveObserver(this);
+  // The teardown method will also remove |this|.
+}
+
+// Removing an unknown observer should be allowed.
+TEST_F(ArcBridgeTest, RemoveUnknownObserver) {
+  ASSERT_FALSE(ready());
+  auto dummy_observer = base::MakeUnique<DummyObserver>();
+  service_->RemoveObserver(dummy_observer.get());
+}
+
 }  // namespace arc