chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc - Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus().

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/chromeos/settings/signed_settings_helper_unittest.cc

Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix the build for sure Created 8 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/update_screen_browsertest.cc ('k') | chrome/browser/chromeos/settings/signed_settings_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc

diff --git a/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc

index 5a01f0d6fbd782f36a947d07ceee818a99357f10..093803ff18ea12edf0b8bd632038745735e15742 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();