WebKit side of merge from r41149 to r41181.

WebCore/dom/WorkerContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 22 matching lines @@
 
 #include "ActiveDOMObject.h"
 #include "DOMTimer.h"
 #include "DOMWindow.h"
 #include "Event.h"
 #include "EventException.h"
 #include "MessageEvent.h"
 #include "NotImplemented.h"
 #include "SecurityOrigin.h"
 #include "WorkerLocation.h"
-#include "WorkerMessagingProxy.h"
 #include "WorkerNavigator.h"
+#include "WorkerObjectProxy.h"
 #include "WorkerThread.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 WorkerContext::WorkerContext(const KURL& url, const String& userAgent, WorkerThread* thread)
     : m_url(url)
     , m_userAgent(userAgent)
     , m_location(WorkerLocation::create(url))
     , m_script(new WorkerScriptController(this))
@@ skipping 158 matching lines @@
     dispatchEvent(evt.release(), ec);
     ASSERT(!ec);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)