Move RegisterContentSchemes from public url_constants into non-public url_schemes.

chrome/test/base/chrome_test_suite.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 "chrome/test/base/chrome_test_suite.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "content/public/common/content_paths.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
-#include "ui/base/ui_base_paths.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/chrome_browser_application_mac.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/shared_memory.h"
 #endif
 
-#include "ui/compositor/compositor_setup.h"
-
 namespace {
 
 void RemoveSharedMemoryFile(const std::string& filename) {
   // Stats uses SharedMemory under the hood. On posix, this results in a file
   // on disk.
 #if defined(OS_POSIX)
   base::SharedMemory memory;
   memory.Delete(filename);
 #endif
 }
@@ skipping 96 matching lines @@
   scoped_ptr<net::ScopedDefaultHostResolverProc> scoped_host_resolver_proc_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTestSuiteInitializer);
 };
 
 }  // namespace
 
 const char ChromeTestSuite::kLaunchAsBrowser[] = "as-browser";
 
 ChromeTestSuite::ChromeTestSuite(int argc, char** argv)
-    : base::TestSuite(argc, argv) {
+    : content::ContentTestSuiteBase(argc, argv) {
 }
 
 ChromeTestSuite::~ChromeTestSuite() {
 }
 
 void ChromeTestSuite::Initialize() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
   chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
 
-  base::TestSuite::Initialize();
-
-  chrome::ChromeContentClient client_for_init;
-  content::SetContentClient(&client_for_init);
-  content::RegisterContentSchemes(false);
-  content::SetContentClient(NULL);
+  content::ContentTestSuiteBase::Initialize();
 
   chrome::RegisterPathProvider();
-  content::RegisterPathProvider();
-  ui::RegisterPathProvider();
 
   if (!browser_dir_.empty()) {
     PathService::Override(base::DIR_EXE, browser_dir_);
     PathService::Override(base::DIR_MODULE, browser_dir_);
   }
 
 #if defined(OS_MACOSX)
   // Look in the framework bundle for resources.
   FilePath path;
   PathService::Get(base::DIR_EXE, &path);
   path = path.Append(chrome::kFrameworkName);
   base::mac::SetOverrideFrameworkBundlePath(path);
 #endif
 
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
   FilePath resources_pack_path;
   PathService::Get(base::DIR_MODULE, &resources_pack_path);
   resources_pack_path =
       resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
   ResourceBundle::GetSharedInstance().AddDataPack(
       resources_pack_path, ui::SCALE_FACTOR_100P);
 
-  // Mock out the compositor on platforms that use it.
-  ui::SetupTestCompositor();
-
   stats_filename_ = base::StringPrintf("unit_tests-%d",
                                        base::GetCurrentProcId());
   RemoveSharedMemoryFile(stats_filename_);
   stats_table_.reset(new base::StatsTable(stats_filename_, 20, 200));
   base::StatsTable::set_current(stats_table_.get());
 
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ChromeTestSuiteInitializer);
 }
 
+content::ContentClient* ChromeTestSuite::CreateClientForInitialization() {
+  return new chrome::ChromeContentClient();
+}
+
 void ChromeTestSuite::Shutdown() {
   ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
 
   base::StatsTable::set_current(NULL);
   stats_table_.reset();
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }