Content Shell: Move ShellMessageFilter to LayoutTestMessageFilter.

content/shell/browser/layout_test/layout_test_content_browser_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 {
 
 LayoutTestContentBrowserClient* g_layout_test_browser_client;
 
 void RequestDesktopNotificationPermissionOnIO(
     const GURL& source_origin,
     RenderFrameHost* render_frame_host,
     const base::Callback<void(blink::WebNotificationPermission)>& callback) {
@@ skipping 24 matching lines @@
 LayoutTestContentBrowserClient::GetLayoutTestNotificationManager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!layout_test_notification_manager_) {
     layout_test_notification_manager_.reset(
         new LayoutTestNotificationManager());
   }
 
   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()));

[Mike West, 2014/10/16 19:42:32]

Nit: We should totally rename these to Blink at some point in the future.

[Peter Beverloo, 2014/10/17 11:07:43]

Agreed, but I'd prefer to avoid changing logic/naming in changes which just move
a bunch of code around. I'll follow up.

+}
+
 void LayoutTestContentBrowserClient::RequestDesktopNotificationPermission(
     const GURL& source_origin,
     RenderFrameHost* render_frame_host,
     const base::Callback<void(blink::WebNotificationPermission)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&RequestDesktopNotificationPermissionOnIO,
                                      source_origin,
                                      render_frame_host,
                                      callback));
 }
 
 blink::WebNotificationPermission
 LayoutTestContentBrowserClient::CheckDesktopNotificationPermission(
     const GURL& source_url,
     ResourceContext* context,
     int render_process_id) {
   LayoutTestNotificationManager* manager = GetLayoutTestNotificationManager();
   if (manager)
     return manager->CheckPermission(source_url);
 
   return blink::WebNotificationPermissionAllowed;
 }
 
 }  // namespace content