| Index: content/child/webcrypto/webcrypto_impl.cc
|
| diff --git a/content/child/webcrypto/webcrypto_impl.cc b/content/child/webcrypto/webcrypto_impl.cc
|
| index 3eed92769c9eab0fe1ae854a2ca48cb2169402f1..6c664b19b8de357b14b9c78a0d2195666765e12a 100644
|
| --- a/content/child/webcrypto/webcrypto_impl.cc
|
| +++ b/content/child/webcrypto/webcrypto_impl.cc
|
| @@ -457,10 +457,6 @@ void DoImportKey(scoped_ptr<ImportKeyState> 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;
|
| @@ -474,7 +470,6 @@ void DoExportKeyReply(scoped_ptr<ExportKeyState> state) {
|
| webcrypto::Uint8VectorStart(&state->buffer)),
|
| state->buffer.size());
|
| }
|
| -#endif
|
| }
|
|
|
| void DoExportKey(scoped_ptr<ExportKeyState> passed_state) {
|
|
|