chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.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/login/users/avatar/user_image_manager_browsertest.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/login/screens/update_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/users/user_manager_unittest.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

index 46a772b4841f07805a23b8fc7de8c6d89cd3788e..38c7e0d081685f33eb71dded2f039e7da33a3a4b 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

@@ -45,7 +45,6 @@

#include "chromeos/chromeos_paths.h"

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_thread_manager.h"

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

#include "chromeos/dbus/fake_session_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

#include "components/policy/core/common/cloud/cloud_policy_core.h"

@@ -601,16 +600,14 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,

public policy::CloudPolicyStore::Observer {

protected:

UserImageManagerPolicyTest()

- : fake_dbus_thread_manager_(new chromeos::FakeDBusThreadManager),

- fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {

- fake_dbus_thread_manager_->SetFakeClients();

- fake_dbus_thread_manager_->SetSessionManagerClient(

- scoped_ptr<SessionManagerClient>(fake_session_manager_client_));

+ : fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {

}

// UserImageManagerTest overrides:

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

- DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager_);

+ DBusThreadManager::GetDBusThreadManagerTestHelper()->

+ SetSessionManagerClient(

+ scoped_ptr<SessionManagerClient>(fake_session_manager_client_));

UserImageManagerTest::SetUpInProcessBrowserTestFixture();

}

@@ -668,7 +665,6 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,

}

policy::UserPolicyBuilder user_policy_;

- FakeDBusThreadManager* fake_dbus_thread_manager_;

FakeSessionManagerClient* fake_session_manager_client_;

scoped_ptr<gfx::ImageSkia> policy_image_;