Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / loader / FrameFetchContext.cpp

diff --git a/src/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/src/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 493bfcf..608a18b 100644 (file)
--- a/src/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/src/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -43,7 +43,7 @@
 #include "core/frame/Settings.h"
 #include "platform/weborigin/SecurityPolicy.h"
 
-namespace WebCore {
+namespace blink {
 
 FrameFetchContext::FrameFetchContext(LocalFrame* frame)
     : m_frame(frame)
@@ -75,7 +75,7 @@ void FrameFetchContext::addAdditionalRequestHeaders(Document* document, Resource
         else if (!request.httpReferrer())
             request.setHTTPReferrer(Referrer(outgoingReferrer, document->referrerPolicy()));
 
-        FrameLoader::addHTTPOriginIfNeeded(request, AtomicString(outgoingOrigin));
+        request.addHTTPOriginIfNeeded(AtomicString(outgoingOrigin));
     }
 
     // The remaining modifications are only necessary for HTTP and HTTPS.
@@ -83,9 +83,6 @@ void FrameFetchContext::addAdditionalRequestHeaders(Document* document, Resource
         return;
 
     m_frame->loader().applyUserAgent(request);
-
-    // Default to sending an empty Origin header if one hasn't been set yet.
-    FrameLoader::addHTTPOriginIfNeeded(request, nullAtom);
 }
 
 void FrameFetchContext::setFirstPartyForCookies(ResourceRequest& request)
@@ -203,4 +200,4 @@ void FrameFetchContext::sendRemainingDelegateMessages(DocumentLoader* loader, un
     dispatchDidFinishLoading(ensureLoader(loader), identifier, 0, 0);
 }
 
-} // namespace WebCore
+} // namespace blink