chrome/browser/chromeos/policy/device_cloud_policy_manager_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: chrome/browser/chromeos/policy/device_cloud_policy_manager_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:

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

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

index 5386ba4695f44c5add3782f8fd77269a70bd5115..09d8da205671e6376d5c843e0a4cb982f7874f1f 100644

--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

@@ -30,7 +30,6 @@

#include "chromeos/dbus/dbus_client_implementation_type.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/fake_cryptohome_client.h"

-#include "chromeos/dbus/fake_dbus_thread_manager.h"

#include "chromeos/dbus/fake_session_manager_client.h"

#include "chromeos/system/mock_statistics_provider.h"

#include "chromeos/system/statistics_provider.h"

@@ -89,8 +88,6 @@ class DeviceCloudPolicyManagerChromeOSTest

state_keys.push_back("2");

state_keys.push_back("3");

fake_session_manager_client_.set_server_backed_state_keys(state_keys);

- fake_dbus_thread_manager_->SetCryptohomeClient(

- scoped_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_));

}

virtual ~DeviceCloudPolicyManagerChromeOSTest() {

@@ -99,6 +96,8 @@ class DeviceCloudPolicyManagerChromeOSTest

virtual void SetUp() OVERRIDE {

DeviceSettingsTestBase::SetUp();

+ dbus_setter_->SetCryptohomeClient(

+ scoped_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_));

install_attributes_.reset(

new EnterpriseInstallAttributes(fake_cryptohome_client_));