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

Unified Diff: services/test/run_all_service_tests.cc

Issue 2897123004: Move display_service_unittests to services_unittests. (Closed)
Patch Set: Merge with tot Created 3 years, 7 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: services/test/run_all_service_tests.cc
diff --git a/services/ui/display/run_all_unittests.cc b/services/test/run_all_service_tests.cc
similarity index 63%
rename from services/ui/display/run_all_unittests.cc
rename to services/test/run_all_service_tests.cc
index 864eaf6cb32fb3eef263838c3419027350aab28d..71b779095aea7ae7aa6de0e5a4ca9d26c48bda00 100644
--- a/services/ui/display/run_all_unittests.cc
+++ b/services/test/run_all_service_tests.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 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.
@@ -7,17 +7,16 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "services/service_manager/public/cpp/test/common_initialization.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
namespace {
-class DisplayServiceTestSuite : public base::TestSuite {
+class ServiceTestSuite : public base::TestSuite {
public:
- DisplayServiceTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv) {}
- ~DisplayServiceTestSuite() override {}
+ ServiceTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
+ ~ServiceTestSuite() override {}
protected:
void Initialize() override {
@@ -35,15 +34,15 @@ class DisplayServiceTestSuite : public base::TestSuite {
}
private:
- DISALLOW_COPY_AND_ASSIGN(DisplayServiceTestSuite);
+ DISALLOW_COPY_AND_ASSIGN(ServiceTestSuite);
};
} // namespace
int main(int argc, char** argv) {
- DisplayServiceTestSuite test_suite(argc, argv);
+ ServiceTestSuite test_suite(argc, argv);
- return base::LaunchUnitTests(
+ return services::InitializeAndLaunchUnitTests(
argc, argv,
- base::Bind(&DisplayServiceTestSuite::Run, base::Unretained(&test_suite)));
+ base::Bind(&ServiceTestSuite::Run, base::Unretained(&test_suite)));
}

Powered by Google App Engine
This is Rietveld 408576698