Commit 85b4b6c7 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

chromeos: get EasyUnlockPrivateApiTests working with mus

Creating BluezDBusManager is unnecessary for --mus, as
WindowManagerService (in ash) takes care of it.

BUG=776514
TEST=test only change

Change-Id: Ie3b7e39a507a9263779ce8f1045141e51d81192f
Reviewed-on: https://chromium-review.googlesource.com/823526Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523697}
parent 6248fb5d
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "extensions/browser/test_event_router.h" #include "extensions/browser/test_event_router.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/cros_system_api/dbus/service_constants.h" #include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/aura/env.h"
namespace { namespace {
...@@ -130,9 +131,11 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest { ...@@ -130,9 +131,11 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest {
proximity_auth::switches::kDisableBluetoothLowEnergyDiscovery); proximity_auth::switches::kDisableBluetoothLowEnergyDiscovery);
chromeos::DBusThreadManager::Initialize(); chromeos::DBusThreadManager::Initialize();
if (aura::Env::GetInstance()->mode() == aura::Env::Mode::LOCAL) {
bluez::BluezDBusManager::Initialize( bluez::BluezDBusManager::Initialize(
chromeos::DBusThreadManager::Get()->GetSystemBus(), chromeos::DBusThreadManager::Get()->GetSystemBus(),
chromeos::DBusThreadManager::Get()->IsUsingFakes()); chromeos::DBusThreadManager::Get()->IsUsingFakes());
}
client_ = chromeos::DBusThreadManager::Get()->GetEasyUnlockClient(); client_ = chromeos::DBusThreadManager::Get()->GetEasyUnlockClient();
extensions::ExtensionApiUnittest::SetUp(); extensions::ExtensionApiUnittest::SetUp();
...@@ -141,6 +144,7 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest { ...@@ -141,6 +144,7 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest {
void TearDown() override { void TearDown() override {
extensions::ExtensionApiUnittest::TearDown(); extensions::ExtensionApiUnittest::TearDown();
if (aura::Env::GetInstance()->mode() == aura::Env::Mode::LOCAL)
bluez::BluezDBusManager::Shutdown(); bluez::BluezDBusManager::Shutdown();
chromeos::DBusThreadManager::Shutdown(); chromeos::DBusThreadManager::Shutdown();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment