Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(742)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc

Issue 2157493003: Revert of bluetooth: Use WebBluetoothDeviceId instead of string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-uuid-typemap
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/bluetooth/frame_connected_bluetooth_devices.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
diff --git a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
index d679abf874d3268433f7825fdf572a8516a8d65c..66d58c531739fbe49d90b323b0e6dca18dc17f3c 100644
--- a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
+++ b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
@@ -29,11 +29,11 @@
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";
@@ -227,7 +227,7 @@
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());
@@ -241,9 +241,9 @@
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
- kDeviceId0);
- EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));
+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
+ kDeviceId0);
+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0), "");
EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
@@ -257,7 +257,7 @@
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());
@@ -272,9 +272,9 @@
EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());
EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),
- kDeviceId0);
- EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));
+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),
+ kDeviceId0);
+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0), "");
EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());
EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));
@@ -288,14 +288,14 @@
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());
@@ -310,14 +310,14 @@
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());
« no previous file with comments | « content/browser/bluetooth/frame_connected_bluetooth_devices.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698