Bug 1113313 - Rename these functions to better reflect what they do. r=billm

--HG--
extra : rebase_source : ae61b3dd6dd5ce50a131a640060d7be57e562e4d

dom/ipc/ContentParent.cpp

@@ -4266,11 +4266,11 @@ ContentParent::RecvOpenAnonymousTemporaryFile(FileDescriptor *aFD)
 static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID);
 
 bool
-ContentParent::RecvFormProcessValue(const nsString& oldValue,
-                                    const nsString& challenge,
-                                    const nsString& keytype,
-                                    const nsString& keyparams,
-                                    nsString* newValue)
+ContentParent::RecvKeygenProcessValue(const nsString& oldValue,
+                                      const nsString& challenge,
+                                      const nsString& keytype,
+                                      const nsString& keyparams,
+                                      nsString* newValue)
 {
     nsCOMPtr<nsIFormProcessor> formProcessor =
       do_GetService(kFormProcessorCID);
@@ -4285,8 +4285,8 @@ ContentParent::RecvFormProcessValue(const nsString& oldValue,
 }
 
 bool
-ContentParent::RecvFormProvideContent(nsString* aAttribute,
-                                      nsTArray<nsString>* aContent)
+ContentParent::RecvKeygenProvideContent(nsString* aAttribute,
+                                        nsTArray<nsString>* aContent)
 {
     nsCOMPtr<nsIFormProcessor> formProcessor =
       do_GetService(kFormProcessorCID);

dom/ipc/ContentParent.h

@@ -722,13 +722,13 @@ private:
     RecvOpenAnonymousTemporaryFile(FileDescriptor* aFD) MOZ_OVERRIDE;
 
     virtual bool
-    RecvFormProcessValue(const nsString& oldValue, const nsString& challenge,
-                         const nsString& keytype, const nsString& keyparams,
-                         nsString* newValue) MOZ_OVERRIDE;
+    RecvKeygenProcessValue(const nsString& oldValue, const nsString& challenge,
+                           const nsString& keytype, const nsString& keyparams,
+                           nsString* newValue) MOZ_OVERRIDE;
 
     virtual bool
-    RecvFormProvideContent(nsString* aAttribute,
-                           nsTArray<nsString>* aContent) MOZ_OVERRIDE;
+    RecvKeygenProvideContent(nsString* aAttribute,
+                             nsTArray<nsString>* aContent) MOZ_OVERRIDE;
 
     virtual PFileDescriptorSetParent*
     AllocPFileDescriptorSetParent(const mozilla::ipc::FileDescriptor&) MOZ_OVERRIDE;

dom/ipc/PContent.ipdl

@@ -798,16 +798,17 @@ parent:
      * before one is submitted. This is urgent because an extension might use
      * a CPOW to synchronously submit a keygen element.
      */
-    prio(urgent) sync FormProcessValue(nsString oldValue,
-                                       nsString challenge,
-                                       nsString keytype,
-                                       nsString keyparams)
+    prio(urgent) sync KeygenProcessValue(nsString oldValue,
+                                         nsString challenge,
+                                         nsString keytype,
+                                         nsString keyparams)
         returns (nsString newValue);
 
     /**
      * Called to provide the options for <keygen> elements.
      */
-    sync FormProvideContent() returns (nsString aAttribute, nsString[] aContent);
+    sync KeygenProvideContent()
+        returns (nsString aAttribute, nsString[] aContent);
 
     // Use only for testing!
     sync GetFileReferences(PersistenceType persistenceType,

security/manager/ssl/src/nsKeygenHandlerContent.cpp

@@ -45,9 +45,9 @@ nsKeygenFormProcessorContent::ProcessValue(nsIDOMHTMLElement* aElement,
 
   nsString oldValue(aValue);
   nsString newValue;
-  unused << child->SendFormProcessValue(oldValue, challengeValue,
-                                        keyTypeValue, keyParamsValue,
-                                        &newValue);
+  unused << child->SendKeygenProcessValue(oldValue, challengeValue,
+                                          keyTypeValue, keyParamsValue,
+                                          &newValue);
 
   aValue.Assign(newValue);
   return NS_OK;
@@ -70,7 +70,9 @@ nsKeygenFormProcessorContent::ProvideContent(const nsAString& aFormType,
                                              nsAString& aAttribute)
 {
   nsString attribute;
-  unused << ContentChild::GetSingleton()->SendFormProvideContent(&attribute, &aContent);
+  unused <<
+    ContentChild::GetSingleton()->SendKeygenProvideContent(&attribute,
+                                                           &aContent);
   aAttribute.Assign(attribute);
   return NS_OK;
 }