WebCrypto: Update the key usage names to reflect recent changes to the spec.

Source/modules/crypto/Key.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
 {
     switch (usage) {
     case WebKit::WebCryptoKeyUsageEncrypt:
         return "encrypt";
     case WebKit::WebCryptoKeyUsageDecrypt:
         return "decrypt";
     case WebKit::WebCryptoKeyUsageSign:
         return "sign";
     case WebKit::WebCryptoKeyUsageVerify:
         return "verify";
-    case WebKit::WebCryptoKeyUsageDerive:
-        return "derive";
-    case WebKit::WebCryptoKeyUsageWrap:
-        return "wrap";
-    case WebKit::WebCryptoKeyUsageUnwrap:
-        return "unwrap";
+    case WebKit::WebCryptoKeyUsageDeriveKey:
+        return "deriveKey";
+    case WebKit::WebCryptoKeyUsageWrapKey:
+        return "wrapKey";
+    case WebKit::WebCryptoKeyUsageUnwrapKey:
+        return "unwrapKey";
     case WebKit::EndOfWebCryptoKeyUsage:
         break;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace
 
 Key::Key(const WebKit::WebCryptoKey& key)
@@ skipping 16 matching lines @@
 {
     if (!m_algorithm)
         m_algorithm = Algorithm::create(m_key.algorithm());
     return m_algorithm.get();
 }
 
 // FIXME: This creates a new javascript array each time. What should happen
 //        instead is return the same (immutable) array. (Javascript callers can
 //        distinguish this by doing an == test on the arrays and seeing they are
 //        different).
-Vector<String> Key::keyUsage() const
+Vector<String> Key::usages() const
 {
     Vector<String> result;
 
     // The WebCryptoKeyUsage values are consecutive powers of 2. Test each one in order.
     for (int i = 0; (1 << i) < WebKit::EndOfWebCryptoKeyUsage; ++i) {
         WebKit::WebCryptoKeyUsage usage = static_cast<WebKit::WebCryptoKeyUsage>(1 << i);
-        if (m_key.keyUsage() & usage)
+        if (m_key.usages() & usage)
             result.append(ASCIILiteral(keyUsageToString(usage)));
     }
     return result;
 }
 
 } // namespace WebCore