Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

content/test/content_test_suite.cc

Index: content/test/content_test_suite.cc
===================================================================
--- content/test/content_test_suite.cc	(revision 257432)
+++ content/test/content_test_suite.cc	(working copy)
@@ -7,8 +7,9 @@
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "content/public/common/content_client.h"
+#include "content/public/common/content_paths.h"
 #include "content/public/test/test_content_client_initializer.h"
-#include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -19,6 +20,7 @@
 #if !defined(OS_IOS)
 #include "base/base_switches.h"
 #include "base/command_line.h"
+#include "media/base/media.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
@@ -70,7 +72,13 @@
 #endif
 
   ContentTestSuiteBase::Initialize();
+  {
+    ContentClient client;
+    ContentTestSuiteBase::RegisterContentSchemes(&client);
+  }
+  RegisterPathProvider();
 #if !defined(OS_IOS)
+  media::InitializeMediaLibraryForTesting();
   // When running in a child process for Mac sandbox tests, the sandbox exists
   // to initialize GL, so don't do it here.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestChildProcess))
@@ -81,8 +89,4 @@
   listeners.Append(new TestInitializationListener);
 }
 
-ContentClient* ContentTestSuite::CreateClientForInitialization() {
-  return new TestContentClient();
-}
-
 }  // namespace content