Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.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 "content/browser/bluetooth/frame_connected_bluetooth_devices.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/bluetooth/web_bluetooth_service_impl.h"
 #include "content/test/test_render_view_host.h"
@@ skipping 104 matching lines @@
   FrameConnectedBluetoothDevices* map1_;
   WebBluetoothServiceImpl* service1_;
 
  private:
   scoped_refptr<NiceMockBluetoothAdapter> adapter_;
   NiceMockBluetoothDevice device0_;
   NiceMockBluetoothDevice device1_;
 };
 
 TEST_F(FrameConnectedBluetoothDevicesTest, Insert_Once) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);

[ortuno, 2017/03/01 04:52:05]

nit: please comment nullptr.

[juncai, 2017/03/02 03:23:38]

Done.

 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, Insert_Twice) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, Insert_TwoDevices) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, Insert_TwoMaps) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionId_OneDevice_AddOnce_RemoveOnce) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionId_OneDevice_AddOnce_RemoveTwice) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionId_OneDevice_AddTwice_RemoveOnce) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionId_OneDevice_AddTwice_RemoveTwice) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionId_TwoDevices) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId1);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionId_TwoMaps) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 
   map0_->CloseConnectionToDeviceWithId(kDeviceId0);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   map1_->CloseConnectionToDeviceWithId(kDeviceId1);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionAddress_OneDevice_AddOnce_RemoveOnce) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
             kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionAddress_OneDevice_AddOnce_RemoveTwice) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
             kDeviceId0);
   EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionAddress_OneDevice_AddTwice_RemoveOnce) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
             kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionAddress_OneDevice_AddTwice_RemoveTwice) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
             kDeviceId0);
   EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoDevices) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
             kDeviceId0);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress1).value(),
             kDeviceId1);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoMaps) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 
   EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
             kDeviceId0);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 
   EXPECT_EQ(map1_->CloseConnectionToDeviceWithAddress(kDeviceAddress1).value(),
             kDeviceId1);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, Destruction_MultipleDevices) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
 
   ResetService0();
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest, Destruction_MultipleMaps) {
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map0_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
-  map1_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
-  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1));
+  map1_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
+  map1_->Insert(kDeviceId1, GetConnection(kDeviceAddress1), nullptr);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
 
   ResetService0();
 
   // WebContents should still be connected because of map1_.
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
 
   ResetService1();
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        DestroyedByWebContentsImplDestruction) {
   // Tests that we don't crash when FrameConnectedBluetoothDevices contains
   // at least one device, and it is destroyed while WebContentsImpl is being
   // destroyed.
-  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
+  map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0), nullptr);
   DeleteContents();
 }
 
 }  // namespace content