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

1 files changed, 6 insertions, 4 deletions

diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 21674d2..a95f7e8 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -7,7 +7,6 @@
 #include "base/clipboard.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebImage.h"
@@ -23,7 +22,9 @@ using WebKit::WebURL;
 
 namespace webkit_glue {
 
-static std::string URLToMarkup(const WebURL& url, const WebString& title) {
+// Static
+std::string WebClipboardImpl::URLToMarkup(const WebURL& url,
+    const WebString& title) {
   std::string markup("<a href=\"");
   markup.append(url.spec());
   markup.append("\">");
@@ -33,8 +34,9 @@ static std::string URLToMarkup(const WebURL& url, const WebString& title) {
   return markup;
 }
 
-static std::string URLToImageMarkup(const WebURL& url,
-                                    const WebString& title) {
+// Static
+std::string WebClipboardImpl::URLToImageMarkup(const WebURL& url,
+    const WebString& title) {
   std::string markup("<img src=\"");
   markup.append(url.spec());
   markup.append("\"");