chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc - Issue 1347193004: Refactor DBusThreadManager to split away BT clients.

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/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc

Issue 1347193004: Refactor DBusThreadManager to split away BT clients. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc

index 912bd7093935cd271d312f987c02c0a11857094b..fc1c8c82b73fb4fe331214366c59dccd3a843006 100644

--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc

+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc

@@ -26,6 +26,7 @@

#include "chromeos/dbus/fake_easy_unlock_client.h"

#include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h"

#include "components/proximity_auth/switches.h"

+#include "device/bluetooth/dbus/bluez_dbus_manager.h"

#include "extensions/browser/api_test_utils.h"

#include "extensions/browser/event_router.h"

#include "extensions/browser/event_router_factory.h"

@@ -127,6 +128,10 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest {

protected:

void SetUp() override {

chromeos::DBusThreadManager::Initialize();

+ bluez::BluezDBusManager::Initialize(

+ chromeos::DBusThreadManager::Get()->GetSystemBus(),

+ chromeos::DBusThreadManager::Get()->IsUsingStub(

+ chromeos::DBusClientBundle::BLUETOOTH));

client_ = chromeos::DBusThreadManager::Get()->GetEasyUnlockClient();

extensions::ExtensionApiUnittest::SetUp();

@@ -135,6 +140,7 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest {

void TearDown() override {

extensions::ExtensionApiUnittest::TearDown();

+ bluez::BluezDBusManager::Shutdown();

chromeos::DBusThreadManager::Shutdown();

}