Index: content/renderer/webcrypto/webcrypto_impl.h |
diff --git a/content/renderer/webcrypto/webcrypto_impl.h b/content/renderer/webcrypto/webcrypto_impl.h |
index 87c611a4309f8f54a15a5c7668a4571394fdbfce..6c6a6b06887f66298093a6afffc64bab99eecd2e 100644 |
--- a/content/renderer/webcrypto/webcrypto_impl.h |
+++ b/content/renderer/webcrypto/webcrypto_impl.h |
@@ -13,56 +13,56 @@ |
namespace content { |
class CONTENT_EXPORT WebCryptoImpl |
- : NON_EXPORTED_BASE(public WebKit::WebCrypto) { |
+ : NON_EXPORTED_BASE(public blink::WebCrypto) { |
public: |
WebCryptoImpl(); |
virtual void encrypt( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoResult result); |
virtual void decrypt( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoResult result); |
virtual void digest( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoAlgorithm& algorithm, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoResult result); |
virtual void generateKey( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoAlgorithm& algorithm, |
bool extractable, |
- WebKit::WebCryptoKeyUsageMask usage_mask, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoKeyUsageMask usage_mask, |
+ blink::WebCryptoResult result); |
virtual void importKey( |
- WebKit::WebCryptoKeyFormat format, |
+ blink::WebCryptoKeyFormat format, |
const unsigned char* key_data, |
unsigned key_data_size, |
- const WebKit::WebCryptoAlgorithm& algorithm_or_null, |
+ const blink::WebCryptoAlgorithm& algorithm_or_null, |
bool extractable, |
- WebKit::WebCryptoKeyUsageMask usage_mask, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoKeyUsageMask usage_mask, |
+ blink::WebCryptoResult result); |
virtual void sign( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoResult result); |
virtual void verifySignature( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* signature, |
unsigned signature_size, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebCryptoResult result); |
+ blink::WebCryptoResult result); |
- static void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size); |
+ static void ShrinkBuffer(blink::WebArrayBuffer* buffer, unsigned new_size); |
protected: |
friend class WebCryptoImplTest; |
@@ -70,50 +70,50 @@ class CONTENT_EXPORT WebCryptoImpl |
void Init(); |
bool EncryptInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebArrayBuffer* buffer); |
+ blink::WebArrayBuffer* buffer); |
bool DecryptInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebArrayBuffer* buffer); |
+ blink::WebArrayBuffer* buffer); |
bool DigestInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoAlgorithm& algorithm, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebArrayBuffer* buffer); |
+ blink::WebArrayBuffer* buffer); |
bool GenerateKeyInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoAlgorithm& algorithm, |
bool extractable, |
- WebKit::WebCryptoKeyUsageMask usage_mask, |
- WebKit::WebCryptoKey* key); |
+ blink::WebCryptoKeyUsageMask usage_mask, |
+ blink::WebCryptoKey* key); |
bool GenerateKeyPairInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoAlgorithm& algorithm, |
bool extractable, |
- WebKit::WebCryptoKeyUsageMask usage_mask, |
- WebKit::WebCryptoKey* public_key, |
- WebKit::WebCryptoKey* private_key); |
+ blink::WebCryptoKeyUsageMask usage_mask, |
+ blink::WebCryptoKey* public_key, |
+ blink::WebCryptoKey* private_key); |
bool ImportKeyInternal( |
- WebKit::WebCryptoKeyFormat format, |
+ blink::WebCryptoKeyFormat format, |
const unsigned char* key_data, |
unsigned key_data_size, |
- const WebKit::WebCryptoAlgorithm& algorithm_or_null, |
+ const blink::WebCryptoAlgorithm& algorithm_or_null, |
bool extractable, |
- WebKit::WebCryptoKeyUsageMask usage_mask, |
- WebKit::WebCryptoKey* key); |
+ blink::WebCryptoKeyUsageMask usage_mask, |
+ blink::WebCryptoKey* key); |
bool SignInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* data, |
unsigned data_size, |
- WebKit::WebArrayBuffer* buffer); |
+ blink::WebArrayBuffer* buffer); |
bool VerifySignatureInternal( |
- const WebKit::WebCryptoAlgorithm& algorithm, |
- const WebKit::WebCryptoKey& key, |
+ const blink::WebCryptoAlgorithm& algorithm, |
+ const blink::WebCryptoKey& key, |
const unsigned char* signature, |
unsigned signature_size, |
const unsigned char* data, |