chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc - Issue 220323004: device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc

Issue 220323004: device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Initialized |empty_device_| in BluetoothDeviceWinTest. Created 6 years, 9 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 | « chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc ('k') | chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc

diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc

index e7d9350f951431b5d12e9240d96d7a58a8797873..98bf071bf1c87824b2d69c5c08de0803a7e00f5f 100644

--- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc

+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc

@@ -16,6 +16,7 @@

#include "chrome/test/base/testing_profile.h"

#include "content/public/browser/notification_service.h"

#include "content/public/test/test_browser_thread.h"

+#include "device/bluetooth/bluetooth_uuid.h"

#include "device/bluetooth/test/mock_bluetooth_adapter.h"

#include "device/bluetooth/test/mock_bluetooth_device.h"

#include "device/bluetooth/test/mock_bluetooth_profile.h"

@@ -28,8 +29,8 @@

namespace {

const char kTestExtensionId[] = "test extension id";

-const char kAudioProfileUuid[] = "audio profile uuid";

-const char kHealthProfileUuid[] = "health profile uuid";

+const device::BluetoothUUID kAudioProfileUuid("1234");

+const device::BluetoothUUID kHealthProfileUuid("4321");

class FakeEventRouter : public extensions::EventRouter {

public:

@@ -221,7 +222,7 @@ TEST_F(BluetoothEventRouterTest, DispatchConnectionEvent) {

ASSERT_TRUE(socket_value->GetDictionary("profile", &profile_value));

std::string uuid;

ASSERT_TRUE(profile_value->GetString("uuid", &uuid));

- EXPECT_STREQ(kAudioProfileUuid, uuid.c_str());

+ EXPECT_STREQ(kAudioProfileUuid.canonical_value().c_str(), uuid.c_str());

EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)).Times(1);

router_.ReleaseSocket(socket_id);