Move RegisterContentSchemes from public url_constants into non-public url_schemes.

content/test/content_test_suite.cc

Index: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 60506ac0c7c873e18223f3fa643fe9596b495ead..36e72292408e5101f24e114e8e5662165a002ddb 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -6,12 +6,9 @@
 
 #include "base/logging.h"
 #include "content/browser/mock_content_browser_client.h"
-#include "content/public/common/content_paths.h"
-#include "content/public/common/url_constants.h"
 #include "content/test/test_content_client.h"
 #include "content/test/test_content_client_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ui_base_paths.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/test_aura_initializer.h"
@@ -20,8 +17,6 @@
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
-#include "ui/compositor/compositor_setup.h"
-
 
 namespace {
 
@@ -47,8 +42,10 @@ class TestInitializationListener : public testing::EmptyTestEventListener {
 
 }  // namespace
 
+namespace content {
+
 ContentTestSuite::ContentTestSuite(int argc, char** argv)
-    : base::TestSuite(argc, argv) {
+    : ContentTestSuiteBase(argc, argv) {
 #if defined(USE_AURA)
   aura_initializer_.reset(new aura::test::TestAuraInitializer);
 #endif
@@ -62,21 +59,15 @@ void ContentTestSuite::Initialize() {
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
 
-  base::TestSuite::Initialize();
-
-  TestContentClient client_for_init;
-  content::SetContentClient(&client_for_init);
-  content::RegisterContentSchemes(false);
-  content::SetContentClient(NULL);
-
-  content::RegisterPathProvider();
-  ui::RegisterPathProvider();
-
-  // Mock out the compositor on platforms that use it.
-  ui::SetupTestCompositor();
+  ContentTestSuiteBase::Initialize();
 
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 }
 
+ContentClient* ContentTestSuite::CreateClientForInitialization() {
+  return new TestContentClient();
+}
+
+}  // namespace content