[refactor] Remove usages of WEBCRYPTO_HAS_ERROR_TYPE ifdef.

[refactor] Remove usages of WEBCRYPTO_HAS_ERROR_TYPE ifdef.

No longer needed now that Blink has rolled.

BUG=245025
R=rsleevi@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267013

[Ryan Sleevi, 2014-04-29 18:47:07]

lgtm

[eroman, 2014-04-29 19:26:05]

The CQ bit was checked by eroman@chromium.org

[commit-bot: I haz the power, 2014-04-29 19:27:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/253123002/1

[commit-bot: I haz the power, 2014-04-29 19:27:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-29 19:28:08]

Failed to apply patch for content/child/webcrypto/webcrypto_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/child/webcrypto/webcrypto_impl.cc
  Hunk #1 FAILED at 96.
  1 out of 1 hunk FAILED -- saving rejects to file
content/child/webcrypto/webcrypto_impl.cc.rej

Patch:       content/child/webcrypto/webcrypto_impl.cc
Index: content/child/webcrypto/webcrypto_impl.cc
diff --git a/content/child/webcrypto/webcrypto_impl.cc
b/content/child/webcrypto/webcrypto_impl.cc
index
dcf57a295b8478f1accf08139514da01cc120d6c..fddde3e9accf174fef68fb5228dd7888b3ede9ce
100644
--- a/content/child/webcrypto/webcrypto_impl.cc
+++ b/content/child/webcrypto/webcrypto_impl.cc
@@ -96,28 +96,15 @@ bool CryptoThreadPool::PostTask(const
tracked_objects::Location& from_here,
 }
 
 void CompleteWithThreadPoolError(blink::WebCryptoResult* result) {
-#if defined(WEBCRYPTO_HAS_ERROR_TYPE)
   result->completeWithError(blink::WebCryptoErrorTypeOperation,
                             "Failed posting to crypto worker pool");
-#else
-  result->completeWithError("Failed posting to crypto worker pool");
-#endif
 }
 
 void CompleteWithError(const Status& status, blink::WebCryptoResult* result) {
   DCHECK(status.IsError());
 
-#if defined(WEBCRYPTO_HAS_ERROR_TYPE)
   result->completeWithError(status.error_type(),
                            
blink::WebString::fromUTF8(status.error_details()));
-#else
-  // TODO(eroman): Delete once Blink changes have rolled into Chromium.
-  if (!status.error_details().empty())
-    result->completeWithError(
-        blink::WebString::fromUTF8(status.error_details()));
-  else
-    result->completeWithError();
-#endif
 }
 
 void CompleteWithBufferOrError(const Status& status,

[eroman, 2014-04-29 22:44:06]

The CQ bit was checked by eroman@chromium.org

[commit-bot: I haz the power, 2014-04-29 22:46:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/253123002/10001

[commit-bot: I haz the power, 2014-04-29 23:52:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-29 23:52:57]

Try jobs failed on following builders:
  win_chromium_rel on tryserver.chromium

[eroman, 2014-04-30 00:46:30]

The CQ bit was checked by eroman@chromium.org

[eroman, 2014-04-30 00:47:56]

Committed patchset #2 manually as r267013 (presubmit successful).

[commit-bot: I haz the power, 2014-04-30 00:48:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/253123002/10001

[commit-bot: I haz the power, 2014-04-30 00:48:26]

Failed to apply patch for content/child/webcrypto/status.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/child/webcrypto/status.cc
  Hunk #1 FAILED at 122.
  1 out of 1 hunk FAILED -- saving rejects to file
content/child/webcrypto/status.cc.rej

Patch:       content/child/webcrypto/status.cc
Index: content/child/webcrypto/status.cc
diff --git a/content/child/webcrypto/status.cc
b/content/child/webcrypto/status.cc
index
6cc7be154b5c0b45ef10edf964172435013c3b95..4fbfd709874742f69c7b412c2de030c311bee196
100644
--- a/content/child/webcrypto/status.cc
+++ b/content/child/webcrypto/status.cc
@@ -122,11 +122,7 @@ Status Status::ErrorImportEmptyKeyData() {
 
 Status Status::ErrorImportAesKeyLength() {
   return Status(blink::WebCryptoErrorTypeData,
-#if defined(WEBCRYPTO_HAS_ERROR_TYPE)
                 "AES key data must be 128, 192 or 256 bits");
-#else
-                "");
-#endif
 }
 
 Status Status::ErrorUnexpectedKeyType() {