diff options
| author | zelidrag <zelidrag@chromium.org> | 2014-08-26 18:44:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 01:45:47 +0000 |
| commit | 29fe338316a08c2669d2e011889dff2b91dfb616 (patch) | |
| tree | b4b49dbe5a9eae924bee60892b2bdda369b440cc /device/nfc | |
| parent | 71d115dac733c9532ab73c9e521f1ab545304d14 (diff) | |
| download | chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.zip chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.tar.gz chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.tar.bz2 | |
Part 3: Merged FakedDBusThreadManager with DBusThreadManager.
BUG=401192
TEST=existing tests
TBR=sky,stevenjb,keybuk
Review URL: https://codereview.chromium.org/477663004
Cr-Commit-Position: refs/heads/master@{#292072}
Diffstat (limited to 'device/nfc')
| -rw-r--r-- | device/nfc/nfc_chromeos_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/device/nfc/nfc_chromeos_unittest.cc b/device/nfc/nfc_chromeos_unittest.cc index 672780f..d748b78 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*>( |