diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 23:47:45 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 23:47:45 +0000 |
| commit | 8117570c80d29229bed3edea8f4288b026714ab1 (patch) | |
| tree | 6dbe7f5621be6046a2719a71d2402dad74e1bb44 /content/child/webcrypto/webcrypto_impl.cc | |
| parent | 4e100e85f041632b1de3fa5513cb582b42d97491 (diff) | |
| download | chromium_src-8117570c80d29229bed3edea8f4288b026714ab1.zip chromium_src-8117570c80d29229bed3edea8f4288b026714ab1.tar.gz chromium_src-8117570c80d29229bed3edea8f4288b026714ab1.tar.bz2 | |
[webcrypto] Remove ifdef that is no longer needed now that blink has rolled.
BUG=373917
R=rsleevi@chromium.org
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/340883004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/webcrypto/webcrypto_impl.cc')
| -rw-r--r-- | content/child/webcrypto/webcrypto_impl.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/content/child/webcrypto/webcrypto_impl.cc b/content/child/webcrypto/webcrypto_impl.cc index 3eed927..6c664b1 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) { |