Enable running webkit tests in parallel and make it use

the number of cpus as the default number of test_shells
to spawn.

This involved ignoring focus/blur messages
and mocking out the clipboard.

The test_shell window still sometimes seems to get focus,
so there's still a bit more work to do, but the tests
seem to all pass.

We still default to 1 test_shell at a time. Once I get this
committed, I'll try multiple. I just don't want to have
to rollback this whole thing.

Review URL: http://codereview.chromium.org/56040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12821 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 23 insertions, 0 deletions

diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 26eb73d..f35e9d1 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -21,6 +21,10 @@ using WebKit::WebURL;
 
 //------------------------------------------------------------------------------
 
+WebKit::WebClipboard* RendererWebKitClientImpl::clipboard() {
+  return &clipboard_;
+} 
+
 WebKit::WebMimeRegistry* RendererWebKitClientImpl::mimeRegistry() {
   return &mime_registry_;
 }
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 603cad9..2efdf66 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -6,6 +6,7 @@
 #define CHROME_RENDERER_RENDERER_WEBKIT_CLIENT_IMPL_H_
 
 #include "webkit/glue/simple_webmimeregistry_impl.h"
+#include "webkit/glue/webclipboard_impl.h"
 #include "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_WIN)
@@ -15,6 +16,7 @@
 class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
  public:
   // WebKitClient methods:
+  virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry();
   virtual WebKit::WebSandboxSupport* sandboxSupport();
   virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);
@@ -43,6 +45,8 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   };
 #endif
 
+  webkit_glue::WebClipboardImpl clipboard_;
+
   MimeRegistry mime_registry_;
 #if defined(OS_WIN)
   SandboxSupport sandbox_support_;
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index e99347a..96fc6ed 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -4,39 +4,53 @@
 
 #include "chrome/worker/worker_webkitclient_impl.h"
 
+#include "base/logging.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 
+WebKit::WebClipboard* WorkerWebKitClientImpl::clipboard() {
+  NOTREACHED();
+  return NULL;
+}
+
 WebKit::WebMimeRegistry* WorkerWebKitClientImpl::mimeRegistry() {
+  NOTREACHED();
   return NULL;
 }
 
 WebKit::WebSandboxSupport* WorkerWebKitClientImpl::sandboxSupport() {
+  NOTREACHED();
   return NULL;
 }
 
 uint64_t WorkerWebKitClientImpl::visitedLinkHash(const char* canonical_url,
                                                  size_t length) {
+  NOTREACHED();
   return 0;
 }
 
 bool WorkerWebKitClientImpl::isLinkVisited(uint64_t link_hash) {
+  NOTREACHED();
   return false;
 }
 
 void WorkerWebKitClientImpl::setCookies(const WebKit::WebURL& url,
                                         const WebKit::WebURL& policy_url,
                                         const WebKit::WebString& value) {
+  NOTREACHED();
 }
 
 WebKit::WebString WorkerWebKitClientImpl::cookies(
     const WebKit::WebURL& url, const WebKit::WebURL& policy_url) {
+  NOTREACHED();
   return WebKit::WebString();
 }
 
 void WorkerWebKitClientImpl::prefetchHostName(const WebKit::WebString&) {
+  NOTREACHED();
 }
 
 WebKit::WebString WorkerWebKitClientImpl::defaultLocale() {
+  NOTREACHED();
   return WebKit::WebString();
 }
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index d378909..e507cc0 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -10,6 +10,7 @@
 class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl {
  public:
   // WebKitClient methods:
+  virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry();
   virtual WebKit::WebSandboxSupport* sandboxSupport();
   virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);