cryptohome: Move Encrypt/DecryptWithSystemSalt() out of CryptohomeLibrary

chrome/browser/chromeos/settings/device_oauth2_token_service.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #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"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 class GoogleServiceAuthError;
 class PrefRegistrySimple;
@@ skipping 35 matching lines @@
 
  private:
   class ValidatingConsumer;
   friend class ValidatingConsumer;
   friend class DeviceOAuth2TokenServiceFactory;
   friend class DeviceOAuth2TokenServiceTest;
   friend class TestDeviceOAuth2TokenService;
 
   // 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);
 
   bool refresh_token_is_valid_;
   int max_refresh_token_validation_retries_;
 
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
   // 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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_