| Index: trunk/src/content/renderer/webcrypto_impl.h
|
| ===================================================================
|
| --- trunk/src/content/renderer/webcrypto_impl.h (revision 223611)
|
| +++ trunk/src/content/renderer/webcrypto_impl.h (working copy)
|
| @@ -8,7 +8,6 @@
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebCrypto.h"
|
|
|
| @@ -24,24 +23,9 @@
|
| const unsigned char* data,
|
| unsigned data_size,
|
| WebKit::WebCryptoResult result);
|
| - virtual void importKey(
|
| - WebKit::WebCryptoKeyFormat format,
|
| - const unsigned char* key_data,
|
| - unsigned key_data_size,
|
| - const WebKit::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - WebKit::WebCryptoKeyUsageMask usage_mask,
|
| - WebKit::WebCryptoResult result);
|
| - virtual void sign(
|
| - const WebKit::WebCryptoAlgorithm& algorithm,
|
| - const WebKit::WebCryptoKey& key,
|
| - const unsigned char* data,
|
| - unsigned data_size,
|
| - WebKit::WebCryptoResult result);
|
|
|
| protected:
|
| FRIEND_TEST_ALL_PREFIXES(WebCryptoImplTest, DigestSampleSets);
|
| - FRIEND_TEST_ALL_PREFIXES(WebCryptoImplTest, HMACSampleSets);
|
|
|
| void Init();
|
|
|
| @@ -50,20 +34,6 @@
|
| const unsigned char* data,
|
| unsigned data_size,
|
| WebKit::WebArrayBuffer* buffer);
|
| - bool ImportKeyInternal(
|
| - WebKit::WebCryptoKeyFormat format,
|
| - const unsigned char* key_data,
|
| - unsigned key_data_size,
|
| - const WebKit::WebCryptoAlgorithm& algorithm,
|
| - WebKit::WebCryptoKeyUsageMask usage_mask,
|
| - scoped_ptr<WebKit::WebCryptoKeyHandle>* handle,
|
| - WebKit::WebCryptoKeyType* type);
|
| - bool SignInternal(
|
| - const WebKit::WebCryptoAlgorithm& algorithm,
|
| - const WebKit::WebCryptoKey& key,
|
| - const unsigned char* data,
|
| - unsigned data_size,
|
| - WebKit::WebArrayBuffer* buffer);
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl);
|
|
|