Fix conversion to WebServiceWorkerResponse headers.

Source/platform/exported/WebServiceWorkerResponse.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 
 #include "platform/blob/BlobData.h"
+#include "platform/network/HTTPHeaderMap.h"
 #include "public/platform/WebHTTPHeaderVisitor.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
 class WebServiceWorkerResponsePrivate : public RefCounted<WebServiceWorkerResponsePrivate> {
 public:
     WebURL url;
     unsigned short status;
     WebString statusText;
-    // FIXME: change headers to a data type that preserves order.
-    HashMap<String, String> headers;
+    HTTPHeaderMap headers;
     RefPtr<BlobDataHandle> blobDataHandle;
 };
 
 WebServiceWorkerResponse::WebServiceWorkerResponse()
     : m_private(adoptRef(new WebServiceWorkerResponsePrivate))
 {
 }
 
 void WebServiceWorkerResponse::reset()
 {
@@ skipping 33 matching lines @@
 WebString WebServiceWorkerResponse::statusText() const
 {
     return m_private->statusText;
 }
 
 void WebServiceWorkerResponse::setHeader(const WebString& key, const WebString& value)
 {
     m_private->headers.set(key, value);
 }
 
+void WebServiceWorkerResponse::appendHeader(const WebString& key, const WebString& value)
+{
+    HTTPHeaderMap::AddResult addResult = m_private->headers.add(key, value);
+    if (!addResult.isNewEntry)
+        addResult.storedValue->value = addResult.storedValue->value + ", " + String(value);
+}
+
 WebVector<WebString> WebServiceWorkerResponse::getHeaderKeys() const
 {
     Vector<String> keys;
-    copyKeysToVector(m_private->headers, keys);
+    for (HTTPHeaderMap::const_iterator it = m_private->headers.begin(), end = m_private->headers.end(); it != end; ++it)
+        keys.append(it->key);
+
     return keys;
 }
 
 WebString WebServiceWorkerResponse::getHeader(const WebString& key) const
 {
     return m_private->headers.get(key);
 }
 
 void WebServiceWorkerResponse::visitHTTPHeaderFields(WebHTTPHeaderVisitor* headerVisitor) const
 {
-    for (HashMap<String, String>::const_iterator i = m_private->headers.begin(), end = m_private->headers.end(); i != end; ++i)
+    for (HTTPHeaderMap::const_iterator i = m_private->headers.begin(), end = m_private->headers.end(); i != end; ++i)
         headerVisitor->visitHeader(i->key, i->value);
 }
 
 WebString WebServiceWorkerResponse::blobUUID() const
 {
     if (!m_private->blobDataHandle)
         return WebString();
     return m_private->blobDataHandle->uuid();
 }
 
-void WebServiceWorkerResponse::setHeaders(const HashMap<String, String>& headers)
-{
-    m_private->headers = headers;
-}
-
-const HashMap<String, String>& WebServiceWorkerResponse::headers() const
+const HTTPHeaderMap& WebServiceWorkerResponse::headers() const
 {
     return m_private->headers;
 }
 
 void WebServiceWorkerResponse::setBlobDataHandle(PassRefPtr<BlobDataHandle> blobDataHandle)
 {
     m_private->blobDataHandle = blobDataHandle;
 }
 
 PassRefPtr<BlobDataHandle> WebServiceWorkerResponse::blobDataHandle() const
 {
     return m_private->blobDataHandle;
 }
 
 } // namespace blink