Cleanup of static lists of schemes & origins that are created at startup.

extensions/test/extensions_unittests_main.cc

 // Copyright 2014 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 <memory>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 15 matching lines @@
 // Content client that exists only to register chrome-extension:// scheme with
 // the url module.
 // TODO(jamescook): Should this be merged with ShellContentClient? Should this
 // be a persistent object available to tests?
 class ExtensionsContentClient : public content::ContentClient {
  public:
   ExtensionsContentClient() {}
   ~ExtensionsContentClient() override {}
 
   // content::ContentClient overrides:
-  void AddAdditionalSchemes(
-      std::vector<url::SchemeWithType>* standard_schemes,
-      std::vector<url::SchemeWithType>* referrer_schemes,
-      std::vector<std::string>* savable_schemes) override {
-    standard_schemes->push_back(url::SchemeWithType{
-        extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT});
-    savable_schemes->push_back(extensions::kExtensionScheme);
+  void AddAdditionalSchemes(Schemes* schemes) override {
+    schemes->standard_schemes.push_back(extensions::kExtensionScheme);
+    schemes->savable_schemes.push_back(extensions::kExtensionScheme);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionsContentClient);
 };
 
 // The test suite for extensions_unittests.
 class ExtensionsTestSuite : public content::ContentTestSuiteBase {
  public:
   ExtensionsTestSuite(int argc, char** argv);
@@ skipping 53 matching lines @@
   content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
 
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
   mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner());
 
   return base::LaunchUnitTests(argc,
                                argv,
                                base::Bind(&content::UnitTestTestSuite::Run,
                                           base::Unretained(&test_suite)));
 }