Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: content/child/webcrypto/webcrypto_impl.cc

Issue 340883004: [webcrypto] Remove ifdef that is no longer needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698