Split most extensions bits in ChromeRenderMessageFilter into ChromeExtensionMessageFilter.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 269e78ae1c1c9cee8163b407dcf6b4ca7008d005..b6b1ac5a92cbea9111a80ae2abc219fe6e61c6e4 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -192,13 +192,11 @@
 #include "components/breakpad/browser/crash_handler_host_linux.h"
 #endif
 
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
-#include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
-#endif
-
 #if defined(OS_ANDROID)
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/android/device_display_info.h"
+#else
+#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
@@ -208,14 +206,6 @@
 #include "components/signin/core/browser/signin_manager.h"
 #endif
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
-#endif
-
-#if defined(ENABLE_WEBRTC)
-#include "chrome/browser/media/webrtc_logging_handler_host.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #endif
@@ -236,6 +226,14 @@
 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
 #endif
 
+#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)

[James Cook, 2014/06/03 16:07:15]

Thanks for cleaning these up!

+#include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
+#endif
+
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
+#endif
+
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 #endif
@@ -244,6 +242,10 @@
 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
 #endif
 
+#if defined(ENABLE_WEBRTC)
+#include "chrome/browser/media/webrtc_logging_handler_host.h"
+#endif
+
 using blink::WebWindowFeatures;
 using base::FileDescriptor;
 using content::AccessTokenStore;
@@ -899,8 +901,11 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
   net::URLRequestContextGetter* context =
       profile->GetRequestContextForRenderProcess(id);
 
-  host->AddFilter(new ChromeRenderMessageFilter(id, profile, context));
+  host->AddFilter(new ChromeRenderMessageFilter(id, profile));
+#if defined(ENABLE_EXTENSIONS)
+  host->AddFilter(new ChromeExtensionMessageFilter(id, profile));
   host->AddFilter(new extensions::ExtensionMessageFilter(id, profile));
+#endif
 #if defined(ENABLE_PLUGINS)
   host->AddFilter(new PluginInfoMessageFilter(id, profile));
 #endif