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

content/public/test/content_test_suite_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/content_test_suite_base.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #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/in_process_gpu_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/in_process_renderer_thread.h"
 #include "content/utility/in_process_utility_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/browser_jni_registrar.h"
 #include "content/common/android/common_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 #endif
 
-#if !defined(OS_IOS)
-#include "media/base/media.h"
-#endif
-
 namespace content {
 
 class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener {
  public:
   ContentTestSuiteBaseListener() {
   }
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     BrowserThreadImpl::FlushThreadPoolHelper();
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentTestSuiteBaseListener);
 };
 
 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv)
-    : base::TestSuite(argc, argv),
-      external_libraries_enabled_(true) {
+    : base::TestSuite(argc, argv) {
 }
 
 void ContentTestSuiteBase::Initialize() {
   base::TestSuite::Initialize();
 
 #if defined(OS_ANDROID)
   // Register JNI bindings for android.
   JNIEnv* env = base::android::AttachCurrentThread();
   content::android::RegisterCommonJni(env);
   content::android::RegisterBrowserJni(env);
   gfx::android::RegisterJni(env);
   media::RegisterJni(env);
   net::android::RegisterJni(env);
   ui::android::RegisterJni(env);
   ui::shell_dialogs::RegisterJni(env);
 #endif
 
+  testing::UnitTest::GetInstance()->listeners().Append(
+      new ContentTestSuiteBaseListener);
+}
+
+void ContentTestSuiteBase::RegisterContentSchemes(
+    ContentClient* content_client) {
+  SetContentClient(content_client);
+  content::RegisterContentSchemes(false);
+  SetContentClient(NULL);
+}
+
+void ContentTestSuiteBase::RegisterInProcessThreads() {
 #if !defined(OS_IOS)
   UtilityProcessHost::RegisterUtilityMainThreadFactory(
       CreateInProcessUtilityThread);
   RenderProcessHost::RegisterRendererMainThreadFactory(
       CreateInProcessRendererThread);
   GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
-  if (external_libraries_enabled_)
-    media::InitializeMediaLibraryForTesting();
 #endif
-
-  scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
-  SetContentClient(client_for_init.get());
-  RegisterContentSchemes(false);
-  SetContentClient(NULL);
-
-  RegisterPathProvider();
-  ui::RegisterPathProvider();
-
-  testing::UnitTest::GetInstance()->listeners().Append(
-      new ContentTestSuiteBaseListener);
 }
 
 }  // namespace content