chrome/browser/chromeos/policy/device_cloud_policy_store_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_store_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

« ash/display/projecting_observer_chromeos_unittest.cc ('K') | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_policy_cros_browser_test.h » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f3860705ffd2ccc34dc2f054c0fa6deeec58a681..cc2b1052ceba07abf004f1c7a86cf540c3e5d5d0 100644

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

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

@@ -17,8 +17,8 @@

#include "chrome/test/base/scoped_testing_local_state.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chromeos/cryptohome/cryptohome_util.h"

+#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/fake_cryptohome_client.h"

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

#include "policy/policy_constants.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -47,13 +47,14 @@ class DeviceCloudPolicyStoreChromeOSTest

&device_settings_service_,

install_attributes_.get(),

base::MessageLoopProxy::current())) {

- fake_dbus_thread_manager_->SetCryptohomeClient(

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

}

virtual void SetUp() OVERRIDE {

DeviceSettingsTestBase::SetUp();

+ dbus_helper_->SetCryptohomeClient(

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

base::RunLoop loop;

EnterpriseInstallAttributes::LockResult result;

install_attributes_->LockDevice(