Isolate tests that initialize ServiceManagerConnection

content/public/test/test_service_manager_context.cc

Index: content/public/test/test_service_manager_context.cc
diff --git a/content/public/test/test_service_manager_context.cc b/content/public/test/test_service_manager_context.cc
index 534647db84ac9ea7b36bbb5cd528ee18b0fa7f5d..f0b14bcbef8987566fad1739a669d5f1035a4c8e 100644
--- a/content/public/test/test_service_manager_context.cc
+++ b/content/public/test/test_service_manager_context.cc
@@ -6,11 +6,17 @@
 
 #include "content/browser/child_process_launcher.h"
 #include "content/browser/service_manager/service_manager_context.h"
+#include "content/public/common/service_manager_connection.h"
 
 namespace content {
 
-TestServiceManagerContext::TestServiceManagerContext()
-    : context_(new ServiceManagerContext) {}
+TestServiceManagerContext::TestServiceManagerContext() {
+  // Isolate from previous tests that may have already initialized
+  // ServiceManagerConnection (e.g. in
+  // RenderProcessHostImpl::InitializeChannelProxy()).
+  ServiceManagerConnection::DestroyForProcess();
+  context_.reset(new ServiceManagerContext);
+}
 
 TestServiceManagerContext::~TestServiceManagerContext() {
   ChildProcessLauncher::ResetRegisteredFilesForTesting();