diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 20:29:52 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 20:29:52 +0000 |
| commit | 693d0144003f6dc825994efdd39b27dfcac81166 (patch) | |
| tree | b7ec02364aab7b07ca5219c979391783c047bebd /chrome/browser/chromeos/settings | |
| parent | 2e78f92ee0d23210d77ff4f4895501ca8f9d2db6 (diff) | |
| download | chromium_src-693d0144003f6dc825994efdd39b27dfcac81166.zip chromium_src-693d0144003f6dc825994efdd39b27dfcac81166.tar.gz chromium_src-693d0144003f6dc825994efdd39b27dfcac81166.tar.bz2 | |
Fixes for handling of MockDBusThreadManager::GetSystemBus().
This is a patch taken over from zel's original patch:
http://codereview.chromium.org/10832258/
BUG=131915
TEST=NetworkScreenTest.* and number of other tests should start passing in BVT CrOS tests
TBR=zelidrag@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10854121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/settings')
| -rw-r--r-- | chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/chromeos/settings/signed_settings_unittest.cc | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc index 5a01f0d..093803f 100644 --- a/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc +++ b/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc @@ -25,6 +25,7 @@ using ::testing::_; using ::testing::A; using ::testing::InSequence; using ::testing::Invoke; +using ::testing::Return; using ::testing::WithArg; namespace em = enterprise_management; @@ -46,6 +47,8 @@ class SignedSettingsHelperTest : public testing::Test, virtual void SetUp() { SignedSettingsHelper::Get()->set_test_delegate(this); + EXPECT_CALL(*mock_dbus_thread_manager_, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); fake_policy_data_ = BuildPolicyData(); diff --git a/chrome/browser/chromeos/settings/signed_settings_unittest.cc b/chrome/browser/chromeos/settings/signed_settings_unittest.cc index 0765f91..2ffa0c8 100644 --- a/chrome/browser/chromeos/settings/signed_settings_unittest.cc +++ b/chrome/browser/chromeos/settings/signed_settings_unittest.cc @@ -118,6 +118,8 @@ class SignedSettingsTest : public testing::Test { virtual void SetUp() { file_thread_.Start(); + EXPECT_CALL(*mock_dbus_thread_manager_, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); } |