Content Shell: Move ShellMessageFilter to LayoutTestMessageFilter.

content/shell/browser/layout_test/layout_test_content_browser_client.cc

Index: content/shell/browser/layout_test/layout_test_content_browser_client.cc
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
index c6b033f612a9738b20416ec2ab799afe4e6f61a6..5194da29cd364dc29a82b1b2dcd9efbc1767f04d 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -4,8 +4,15 @@
 
 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h"
 
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/shell/browser/layout_test/layout_test_message_filter.h"
 #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
+#include "content/shell/browser/shell_browser_context.h"
+#include "content/shell/common/shell_messages.h"
+#include "content/shell/common/webkit_test_helpers.h"
 
 namespace content {
 namespace {
@@ -50,6 +57,21 @@ LayoutTestContentBrowserClient::GetLayoutTestNotificationManager() {
   return layout_test_notification_manager_.get();
 }
 
+void LayoutTestContentBrowserClient::RenderProcessWillLaunch(
+    RenderProcessHost* host) {
+  ShellContentBrowserClient::RenderProcessWillLaunch(host);
+
+  StoragePartition* partition =
+      BrowserContext::GetDefaultStoragePartition(browser_context());
+  host->AddFilter(new LayoutTestMessageFilter(
+      host->GetID(),
+      partition->GetDatabaseTracker(),
+      partition->GetQuotaManager(),
+      partition->GetURLRequestContext()));
+
+  host->Send(new ShellViewMsg_SetWebKitSourceDir(GetWebKitRootDirFilePath()));
+}
+
 void LayoutTestContentBrowserClient::RequestDesktopNotificationPermission(
     const GURL& source_origin,
     RenderFrameHost* render_frame_host,