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

Unified Diff: content/public/test/content_test_suite_base.cc

Issue 23235002: Set up content in-process main threads via factory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ios Created 7 years, 4 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: content/public/test/content_test_suite_base.cc
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 5bf5b5eded1cb0668a5476cad4086ae013d39fe7..f245683db1f4d900eb954343ef0bf9f3a9e29670 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -10,9 +10,15 @@
#include "base/test/test_suite.h"
#include "base/threading/sequenced_worker_pool.h"
#include "content/browser/browser_thread_impl.h"
+#include "content/browser/gpu/gpu_process_host.h"
#include "content/common/url_schemes.h"
+#include "content/gpu/gpu_main_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/utility_process_host.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_paths.h"
+#include "content/renderer/renderer_main_thread.h"
+#include "content/utility/utility_main_thread.h"
#include "media/base/media.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_paths.h"
@@ -60,6 +66,13 @@ void ContentTestSuiteBase::Initialize() {
ui::shell_dialogs::RegisterJni(env);
#endif
+#if !defined(OS_IOS)
+ UtilityProcessHost::RegisterUtilityMainThreadFactory(CreateUtilityMainThread);
+ RenderProcessHost::RegisterRendererMainThreadFactory(
+ CreateRendererMainThread);
+ GpuProcessHost::RegisterGpuMainThreadFactory(CreateGpuMainThread);
+#endif
+
if (external_libraries_enabled_)
media::InitializeMediaLibraryForTesting();

Powered by Google App Engine
This is Rietveld 408576698