chrome/browser/chromeos/settings/device_oauth2_token_service_factory.cc - Issue 25975002: cryptohome: Move Encrypt/DecryptWithSystemSalt() out of CryptohomeLibrary

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/device_oauth2_token_service_factory.cc

Issue 25975002: cryptohome: Move Encrypt/DecryptWithSystemSalt() out of CryptohomeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments Created 7 years, 2 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/settings/device_oauth2_token_service.cc ('k') | chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 65ff56cdbcb4c052eb85593fcfa652feef54a965..57b6efb1dae9df33137b45a784612bd260fd7b5c 100644

--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.cc

+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"

+#include "chrome/browser/chromeos/settings/token_encryptor.h"

#include "content/public/browser/browser_thread.h"

namespace chromeos {

@@ -27,7 +28,8 @@ void DeviceOAuth2TokenServiceFactory::Initialize() {

DCHECK(!g_device_oauth2_token_service_);

g_device_oauth2_token_service_ = new DeviceOAuth2TokenService(

g_browser_process->system_request_context(),

- g_browser_process->local_state());

+ g_browser_process->local_state(),

+ new CryptohomeTokenEncryptor);

}

// static