device/nfc/nfc_chromeos_unittest.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

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: device/nfc/nfc_chromeos_unittest.cc

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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:

Index: device/nfc/nfc_chromeos_unittest.cc

diff --git a/device/nfc/nfc_chromeos_unittest.cc b/device/nfc/nfc_chromeos_unittest.cc

index 672780f81bdca8f97e9224219b3274d4e587dd67..d748b789ee26f0291ac68486c180ac21911d2800 100644

--- a/device/nfc/nfc_chromeos_unittest.cc

+++ b/device/nfc/nfc_chromeos_unittest.cc

@@ -142,7 +142,7 @@ class TestObserver : public NfcAdapter::Observer,

class NfcChromeOSTest : public testing::Test {

public:

virtual void SetUp() {

- DBusThreadManager::InitializeWithStub();

+ DBusThreadManager::Initialize();

fake_nfc_adapter_client_ = static_cast<FakeNfcAdapterClient*>(

DBusThreadManager::Get()->GetNfcAdapterClient());

fake_nfc_device_client_ = static_cast<FakeNfcDeviceClient*>(