Make OSX TestShell able to run workers, using a new test_worker.dylib which i...

webkit/tools/test_shell/test_webworker_helper.cc

Index: webkit/tools/test_shell/test_webworker_helper.cc
===================================================================
--- webkit/tools/test_shell/test_webworker_helper.cc	(revision 13023)
+++ webkit/tools/test_shell/test_webworker_helper.cc	(working copy)
@@ -11,13 +11,16 @@
 
 #include "webkit/tools/test_shell/test_webworker_helper.h"
 
+#if defined(OS_MACOSX)
+#include <dlfcn.h>
+#endif
+
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "webkit/glue/webworkerclient.h"
 
-
 WebWorker* TestWebWorkerHelper::CreateWebWorker(WebWorkerClient* client) {
   TestWebWorkerHelper* loader = new TestWebWorkerHelper();
   return loader->CreateWebWorker_(client, loader);
@@ -43,28 +46,38 @@
   return WTF::callOnMainThread(func, context);
 }
 
-bool TestWebWorkerHelper::Load() {
-#if defined(OS_WIN)
+void TestWebWorkerHelper::Load() {
   FilePath path;
   PathService::Get(base::DIR_EXE, &path);
+
+#if defined(OS_WIN)
   path = path.AppendASCII("test_worker.dll");
 
   module_ = LoadLibrary(path.value().c_str());
   if (module_ == 0)
-    return false;
+    return;
 
   CreateWebWorker_ = reinterpret_cast<CreateWebWorkerFunc>
       (GetProcAddress(module_, "CreateWebWorker"));
   if (!CreateWebWorker_) {
     FreeLibrary(module_);
     module_ = 0;
-    return false;
   }
+#elif defined(OS_MACOSX)
+  path = path.AppendASCII("test_worker.dylib");
 
-  return true;
+  module_ = dlopen(path.value().c_str(), RTLD_NOW | RTLD_LOCAL);
+  if (!module_)
+    return;
+
+  CreateWebWorker_ = reinterpret_cast<CreateWebWorkerFunc>
+      (dlsym(module_, "CreateWebWorker"));
+  if (!CreateWebWorker_) {
+    dlclose(module_);
+    module_ = 0;
+  }
 #else
   NOTIMPLEMENTED();
-  return false;
 #endif
 }