chromeos/dbus/cryptohome_client.cc - Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

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: chromeos/dbus/cryptohome_client.cc

Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix the build Created 7 years, 3 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:

Index: chromeos/dbus/cryptohome_client.cc

diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc

index c117f58836c7d1f688900bc8747c8cb4e292dc76..cd027e3e6249f3b87329ff5fcff342934f8dc176 100644

--- a/chromeos/dbus/cryptohome_client.cc

+++ b/chromeos/dbus/cryptohome_client.cc

@@ -10,7 +10,7 @@

#include "base/message_loop/message_loop.h"

#include "chromeos/cryptohome/async_method_caller.h"

#include "chromeos/dbus/blocking_method_caller.h"

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

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

#include "dbus/bus.h"

#include "dbus/message.h"

#include "dbus/object_path.h"

@@ -857,7 +857,7 @@ CryptohomeClient* CryptohomeClient::Create(DBusClientImplementationType type) {

if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)

return new CryptohomeClientImpl();

DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);

- return new CryptohomeClientStubImpl();

+ return new FakeCryptohomeClient();

}

// static

« no previous file with comments | « chromeos/chromeos.gyp ('k') | chromeos/dbus/cryptohome_client_stub.h » ('j') | no next file with comments »