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

Unified Diff: content/public/common/content_client.cc

Issue 18119009: Make utility process run in-process when running in single-process mode. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: undo unnecessary changes Created 7 years, 5 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
« no previous file with comments | « content/public/common/content_client.h ('k') | content/utility/utility_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/content_client.cc
===================================================================
--- content/public/common/content_client.cc (revision 210446)
+++ content/public/common/content_client.cc (working copy)
@@ -30,6 +30,12 @@
g_client->renderer_ = r;
return rv;
}
+
+ static ContentUtilityClient* SetUtility(ContentUtilityClient* u) {
+ ContentUtilityClient* rv = g_client->utility_;
+ g_client->utility_ = u;
+ return rv;
+ }
};
void SetContentClient(ContentClient* client) {
@@ -55,6 +61,10 @@
return InternalTestInitializer::SetRenderer(r);
}
+ContentUtilityClient* SetUtilityClientForTesting(ContentUtilityClient* u) {
+ return InternalTestInitializer::SetUtility(u);
+}
+
const std::string& GetUserAgent(const GURL& url) {
DCHECK(g_client);
return webkit_glue::GetUserAgent(url);
« no previous file with comments | « content/public/common/content_client.h ('k') | content/utility/utility_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698