[webcrypto] exportKey() now returns dictionary when format='jwk' (CL 2 of 2).

public/platform/WebCrypto.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "WebPrivatePtr.h"
 #include "WebString.h"
 #include "WebVector.h"
 
 namespace WebCore { class CryptoResult; }
 
 #if INSIDE_BLINK
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
+// FIXME: Remove once chromium side rolls.
+#define WEBCRYPTO_RESULT_ACCEPTS_JSON 1
+
 namespace blink {
 
 class WebArrayBuffer;
 class WebString;
 
 enum WebCryptoErrorType {
     WebCryptoErrorTypeType,
     WebCryptoErrorTypeNotSupported,
     WebCryptoErrorTypeSyntax,
     WebCryptoErrorTypeInvalidState,
@@ skipping 26 matching lines @@
     // Error details are surfaced in an exception, and MUST NEVER reveal any
     // secret information such as bytes of the key or plain text. An
     // appropriate error would be something like:
     //   "iv must be 16 bytes long".
     BLINK_PLATFORM_EXPORT void completeWithError(WebCryptoErrorType, const WebString&);
 
     // Note that WebArrayBuffer is NOT safe to create from another thread.
     BLINK_PLATFORM_EXPORT void completeWithBuffer(const WebArrayBuffer&);
     // Makes a copy of the input data given as a pointer and byte length.
     BLINK_PLATFORM_EXPORT void completeWithBuffer(const void*, unsigned);
+    BLINK_PLATFORM_EXPORT void completeWithJson(const char* utf8Data, unsigned length);
     BLINK_PLATFORM_EXPORT void completeWithBoolean(bool);
     BLINK_PLATFORM_EXPORT void completeWithKey(const WebCryptoKey&);
     BLINK_PLATFORM_EXPORT void completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey);
 
 #if INSIDE_BLINK
     BLINK_PLATFORM_EXPORT explicit WebCryptoResult(const WTF::PassRefPtr<WebCore::CryptoResult>&);
 #endif
 
 private:
     BLINK_PLATFORM_EXPORT void reset();
@@ skipping 163 matching lines @@
     // Returns true on success.
     virtual bool serializeKeyForClone(const WebCryptoKey&, WebVector<unsigned char>&) { return false; }
 
 protected:
     virtual ~WebCrypto() { }
 };
 
 } // namespace blink
 
 #endif