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

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: Fixed failure on win perf bot. Created 7 years, 10 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 9c126c7dd771a91070e084e972df0dfdd2f557b7..e1908ecd0cfaf524fefaf5a55872100f4c988ffa 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -20,7 +20,7 @@
#include "chrome/browser/browsing_data/browsing_data_helper.h"
#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"
@@ -648,8 +648,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
@@ -662,8 +665,8 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
#if defined(OS_MACOSX)
host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac());
#endif
- host->GetChannel()->AddFilter(new ChromeBenchmarkingMessageFilter(
- id, profile, profile->GetRequestContextForRenderProcess(id)));
+ host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter(
+ id, profile, context));
host->GetChannel()->AddFilter(
new prerender::PrerenderMessageFilter(id, profile));
« no previous file with comments | « chrome/browser/chrome_benchmarking_message_filter.cc ('k') | chrome/browser/chrome_net_benchmarking_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698