Revert of bluetooth: Use WebBluetoothDeviceId instead of string

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/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
@@ skipping 11 matching lines @@
 typedef testing::NiceMock<device::MockBluetoothDevice> NiceMockBluetoothDevice;
 typedef testing::NiceMock<device::MockBluetoothGattConnection>
     NiceMockBluetoothGattConnection;
 
 using testing::Return;
 using testing::StrEq;
 using testing::_;
 
 namespace {
 
-const WebBluetoothDeviceId kDeviceId0("000000000000000000000A==");
+constexpr char kDeviceId0[] = "0";
 constexpr char kDeviceAddress0[] = "0";
 constexpr char kDeviceName0[] = "Device0";
 
-const WebBluetoothDeviceId kDeviceId1("111111111111111111111A==");
+constexpr char kDeviceId1[] = "1";
 constexpr char kDeviceAddress1[] = "1";
 constexpr char kDeviceName1[] = "Device1";
 
 class FrameConnectedBluetoothDevicesTest
     : public RenderViewHostImplTestHarness {
  public:
   FrameConnectedBluetoothDevicesTest()
       : adapter_(new NiceMockBluetoothAdapter()),
         device0_(adapter_.get(),
                  0 /* class */,
@@ skipping 173 matching lines @@
   EXPECT_FALSE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionAddress_OneDevice_AddOnce_RemoveOnce) {
   map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
             kDeviceId0);
 
   EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 }
 
 TEST_F(FrameConnectedBluetoothDevicesTest,
        CloseConnectionAddress_OneDevice_AddOnce_RemoveTwice) {
   map0_->Insert(kDeviceId0, GetConnection(kDeviceAddress0));
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
             kDeviceId0);
-  EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));
+  EXPECT_EQ(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));
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
             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));
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
             kDeviceId0);
-  EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));
+  EXPECT_EQ(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));
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
             kDeviceId0);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress1).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress1),
             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));
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 
-  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
+  EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
             kDeviceId0);
 
   EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
   EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
   EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));
 
-  EXPECT_EQ(map1_->CloseConnectionToDeviceWithAddress(kDeviceAddress1).value(),
+  EXPECT_EQ(map1_->CloseConnectionToDeviceWithAddress(kDeviceAddress1),
             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));
 
@@ skipping 27 matching lines @@
        DestroyedByWebContentsImplDestruction) {
   // Tests that we don't crash when FrameConnectedBluetoothDevices contains
   // at least one device, and it is destroyed while WebContentsImpl is being
   // destroyed.
 
   // TODO(ortuno): Write test.
   // http://crbug.com/615319
 }
 
 }  // namespace content