Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: extensions/test/extensions_unittests_main.cc

Issue 375243002: Move ModuleSystemTest and the tests that use it into extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/test/extensions_unittests_main.cc
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index 78b0a8d17722f79a8c358206e6f4dbe78ec15454..3936723411da96d0eab969a3ad1a348f8a59e69b 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -2,11 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/base_paths.h"
#include "base/bind.h"
#include "base/macros.h"
+#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
+#include "content/public/test/unittest_test_suite.h"
+#include "extensions/common/extension_paths.h"
#include "extensions/test/test_extensions_client.h"
+#include "ui/base/resource/resource_bundle.h"
namespace {
@@ -30,21 +35,30 @@ ExtensionsTestSuite::ExtensionsTestSuite(int argc, char** argv)
void ExtensionsTestSuite::Initialize() {
base::TestSuite::Initialize();
+ extensions::RegisterPathProvider();
+
+ base::FilePath resources_pack_path;
+ PathService::Get(base::DIR_MODULE, &resources_pack_path);
+ ResourceBundle::InitSharedInstanceWithPakPath(
+ resources_pack_path.AppendASCII("extensions_unittests_resources.pak"));
+
client_.reset(new extensions::TestExtensionsClient());
extensions::ExtensionsClient::Set(client_.get());
}
void ExtensionsTestSuite::Shutdown() {
+ ResourceBundle::CleanupSharedInstance();
base::TestSuite::Shutdown();
}
} // namespace
int main(int argc, char** argv) {
- ExtensionsTestSuite test_suite(argc, argv);
+ content::UnitTestTestSuite test_suite(
+ new ExtensionsTestSuite(argc, argv));
return base::LaunchUnitTests(argc,
argv,
- base::Bind(&ExtensionsTestSuite::Run,
+ base::Bind(&content::UnitTestTestSuite::Run,
base::Unretained(&test_suite)));
}
« extensions/renderer/module_system_unittest.cc ('K') | « extensions/test/data/json_schema_test.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698