cryptohome: Move Encrypt/DecryptWithSystemSalt() out of CryptohomeLibrary

chrome/browser/chromeos/settings/device_oauth2_token_service.h

Index: chrome/browser/chromeos/settings/device_oauth2_token_service.h
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.h b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
index 08d47d5c74167f7e25817fc678ff6e4c4e4f10e9..d371153384383ef0c00b3abe465e63799ddc61bc 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
+#include "chrome/browser/chromeos/settings/token_encryptor.h"

[hashimoto, 2013/10/04 08:38:56]

nit: Can't this include replaced with a forward declaration?

[satorux1, 2013/10/07 02:19:14]

Done.

 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -68,7 +69,8 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {
 
   // Use DeviceOAuth2TokenServiceFactory to get an instance of this class.
   explicit DeviceOAuth2TokenService(net::URLRequestContextGetter* getter,
-                                    PrefService* local_state);
+                                    PrefService* local_state,
+                                    TokenEncryptor* token_encryptor);

[hashimoto, 2013/10/04 08:38:56]

nit: How about taking scoped_ptr<TokenEncryptor> as an argument to make the
ownership clear?

[satorux1, 2013/10/07 02:19:14]

Thought it's a good idea but doing it would make it difficult to set mock
behaviors in the unit test. currently, we do something like

  mock_(new MockTokenEncryptor),
  service_(new DeviceOAuth2TokenService(..., mock_)),

If mock_ is a scoped ptr and Passed(), we cannot set mock expectations. We could
expose it via getter like token_encryptor() but it'd be a bit undesirable. For
now, let me keep it as-is but add a comment about ownership.

   virtual ~DeviceOAuth2TokenService();
 
   void OnValidationComplete(bool token_is_valid);
@@ -81,6 +83,10 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {
   // Cache the decrypted refresh token, so we only decrypt once.
   std::string refresh_token_;
   PrefService* local_state_;
+
+  // Used to encrypt/decrypt the refresh token.
+  scoped_ptr<TokenEncryptor> token_encryptor_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceOAuth2TokenService);
 };