Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 11801024: Fixed browser crash when using Debug build: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separates chrome.benchmarking.closeConnections() in order to remove --enable-benchmarking from tele… Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d27c0b252b8b24b82d45b593d0d7beb09ac51617..5ca332f737ac14febc58dc8211dc74e67a7831eb 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/browsing_data/browsing_data_remover.h"
#include "chrome/browser/character_encoding.h"
#include "chrome/browser/chrome_benchmarking_message_filter.h"
+#include "chrome/browser/chrome_net_benchmarking_message_filter.h"
#include "chrome/browser/chrome_quota_permission_context.h"
#include "chrome/browser/content_settings/content_settings_utils.h"
#include "chrome/browser/content_settings/cookie_settings.h"
@@ -592,8 +593,11 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
content::RenderProcessHost* host) {
int id = host->GetID();
Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
+ net::URLRequestContextGetter* context =
+ profile->GetRequestContextForRenderProcess(id);
+
host->GetChannel()->AddFilter(new ChromeRenderMessageFilter(
- id, profile, profile->GetRequestContextForRenderProcess(id)));
+ id, profile, context));
#if defined(ENABLE_PLUGINS)
host->GetChannel()->AddFilter(new PluginInfoMessageFilter(id, profile));
#endif
@@ -607,7 +611,9 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac());
#endif
host->GetChannel()->AddFilter(new ChromeBenchmarkingMessageFilter(
- id, profile, profile->GetRequestContextForRenderProcess(id)));
+ id, profile, context));
+ host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter(
+ context));
host->GetChannel()->AddFilter(
new prerender::PrerenderMessageFilter(id, profile));

Powered by Google App Engine
This is Rietveld 408576698