| 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 1e98c971f84eccd44dea1102742d98f9d6fe3713..642d64025f42a2fe71076d67c21d83297d15e1cb 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -45,22 +45,20 @@
|
| #include "chrome/browser/content_settings/cookie_settings_factory.h"
|
| #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
| #include "chrome/browser/content_settings/tab_specific_content_settings.h"
|
| #include "chrome/browser/defaults.h"
|
| #include "chrome/browser/download/download_prefs.h"
|
| #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
|
| #include "chrome/browser/font_family_cache.h"
|
| #include "chrome/browser/media/media_capture_devices_dispatcher.h"
|
| #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
|
| #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
|
| -#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
|
| -#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
|
| #include "chrome/browser/notifications/platform_notification_service_impl.h"
|
| #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h"
|
| #include "chrome/browser/password_manager/chrome_password_manager_client.h"
|
| #include "chrome/browser/permissions/permission_context_base.h"
|
| #include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/prerender/prerender_final_status.h"
|
| #include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/browser/prerender/prerender_manager_factory.h"
|
| #include "chrome/browser/prerender/prerender_message_filter.h"
|
| #include "chrome/browser/printing/printing_message_filter.h"
|
| @@ -113,21 +111,20 @@
|
| #include "chromeos/chromeos_constants.h"
|
| #include "components/autofill/content/browser/content_autofill_driver_factory.h"
|
| #include "components/autofill/core/common/autofill_switches.h"
|
| #include "components/cdm/browser/cdm_message_filter_android.h"
|
| #include "components/cloud_devices/common/cloud_devices_switches.h"
|
| #include "components/content_settings/core/browser/content_settings_utils.h"
|
| #include "components/content_settings/core/browser/cookie_settings.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/content_settings/core/common/content_settings_types.h"
|
| -#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_message_filter.h"
|
| #include "components/dom_distiller/core/dom_distiller_switches.h"
|
| #include "components/dom_distiller/core/url_constants.h"
|
| #include "components/error_page/common/error_page_switches.h"
|
| #include "components/google/core/browser/google_util.h"
|
| #include "components/metrics/client_info.h"
|
| #include "components/net_log/chrome_net_log.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/prefs/scoped_user_pref_update.h"
|
| #include "components/rappor/rappor_utils.h"
|
| @@ -1030,24 +1027,20 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
|
| #endif
|
| #if !defined(DISABLE_NACL)
|
| host->AddFilter(new nacl::NaClHostMessageFilter(
|
| id, profile->IsOffTheRecord(),
|
| profile->GetPath(),
|
| context));
|
| #endif
|
| #if defined(OS_ANDROID)
|
| host->AddFilter(new cdm::CdmMessageFilterAndroid());
|
| #endif
|
| - DataReductionProxyChromeSettings* data_reduction_proxy_settings =
|
| - DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile);
|
| - host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter(
|
| - data_reduction_proxy_settings));
|
|
|
| host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
|
| profile->IsOffTheRecord()));
|
|
|
| for (size_t i = 0; i < extra_parts_.size(); ++i)
|
| extra_parts_[i]->RenderProcessWillLaunch(host);
|
|
|
| RendererContentSettingRules rules;
|
| if (host->IsForGuestsOnly()) {
|
| #if defined(ENABLE_EXTENSIONS)
|
|
|