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

content/child/webcrypto/webcrypto_impl.cc

 // Copyright 2014 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.
 
 #include "content/child/webcrypto/webcrypto_impl.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 439 matching lines @@
     DCHECK(state->key.handle());
     DCHECK(!state->key.algorithm().isNull());
     DCHECK_EQ(state->extractable, state->key.extractable());
   }
 
   state->origin_thread->PostTask(
       FROM_HERE, base::Bind(DoImportKeyReply, Passed(&passed_state)));
 }
 
 void DoExportKeyReply(scoped_ptr<ExportKeyState> state) {
+#ifndef WEBCRYPTO_RESULT_ACCEPTS_JSON
+  // TODO(eroman): Remove idfef once blink rolls.
   CompleteWithBufferOrError(state->status, state->buffer, &state->result);
+#else
+  if (state->format != blink::WebCryptoKeyFormatJwk) {
+    CompleteWithBufferOrError(state->status, state->buffer, &state->result);
+    return;
+  }
+
+  if (state->status.IsError()) {
+    CompleteWithError(state->status, &state->result);
+  } else {
+    state->result.completeWithJson(
+        reinterpret_cast<const char*>(
+            webcrypto::Uint8VectorStart(&state->buffer)),
+        state->buffer.size());

[Ryan Sleevi, 2014/06/17 19:15:20]

This feels like there's a dependent CL here (perhaps already landed) that
explores this. Can you link me?

+  }
+#endif
 }
 
 void DoExportKey(scoped_ptr<ExportKeyState> passed_state) {
   ExportKeyState* state = passed_state.get();
   state->status =
       webcrypto::ExportKey(state->format, state->key, &state->buffer);
   state->origin_thread->PostTask(
       FROM_HERE, base::Bind(DoExportKeyReply, Passed(&passed_state)));
 }
 
@@ skipping 259 matching lines @@
       &key);
 }
 
 bool WebCryptoImpl::serializeKeyForClone(
     const blink::WebCryptoKey& key,
     blink::WebVector<unsigned char>& key_data) {
   return webcrypto::SerializeKeyForClone(key, &key_data);
 }
 
 }  // namespace content