CSP: 'connect-src' should not cause exceptions.

third_party/WebKit/Source/modules/eventsource/EventSource.cpp

 /*
  * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved.
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011, Code Aurora Forum. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 81 matching lines @@
   }
 
   KURL fullURL = context->completeURL(url);
   if (!fullURL.isValid()) {
     exceptionState.throwDOMException(
         SyntaxError,
         "Cannot open an EventSource to '" + url + "'. The URL is invalid.");
     return nullptr;
   }
 
-  // FIXME: Convert this to check the isolated world's Content Security Policy
-  // once webkit.org/b/104520 is solved.
-  if (!ContentSecurityPolicy::shouldBypassMainWorld(context) &&
-      !context->contentSecurityPolicy()->allowConnectToSource(fullURL)) {
-    // We can safely expose the URL to JavaScript, as this exception is generate
-    // synchronously before any redirects take place.
-    exceptionState.throwSecurityError(
-        "Refused to connect to '" + fullURL.elidedString() +
-        "' because it violates the document's Content Security Policy.");
-    return nullptr;
-  }
-
   EventSource* source = new EventSource(context, fullURL, eventSourceInit);
 
   source->scheduleInitialConnect();
   return source;
 }
 
 EventSource::~EventSource() {
   DCHECK_EQ(kClosed, m_state);
   DCHECK(!m_loader);
 }
@@ skipping 192 matching lines @@
   DCHECK_EQ(kOpen, m_state);
   DCHECK(m_loader);
 
   networkRequestEnded();
 }
 
 void EventSource::didFail(const ResourceError& error) {
   DCHECK_NE(kClosed, m_state);
   DCHECK(m_loader);
 
+  if (error.isAccessCheck()) {
+    didFailAccessControlCheck(error);
+    return;
+  }
+
   if (error.isCancellation())
     m_state = kClosed;
   networkRequestEnded();
 }
 
 void EventSource::didFailAccessControlCheck(const ResourceError& error) {
   DCHECK(m_loader);
 
   String message = "EventSource cannot load " + error.failingURL() + ". " +
                    error.localizedDescription();
@@ skipping 46 matching lines @@
 
 DEFINE_TRACE(EventSource) {
   visitor->trace(m_parser);
   visitor->trace(m_loader);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
   EventSourceParser::Client::trace(visitor);
 }
 
 }  // namespace blink