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

Unified Diff: base/test/launcher/test_launcher_ios.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/util/PerfTest.java ('k') | base/time/time.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/launcher/test_launcher_ios.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_unittests.cc b/base/test/launcher/test_launcher_ios.cc
similarity index 53%
copy from mojo/services/public/cpp/view_manager/lib/view_manager_unittests.cc
copy to base/test/launcher/test_launcher_ios.cc
index 9f4f1094e393fd3dd2c75ec2480b37567431fd3e..38e4ef9aa916ceca2d49d2f043cf65c1a3d6f6c3 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_unittests.cc
+++ b/base/test/launcher/test_launcher_ios.cc
@@ -2,13 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/test/launcher/test_launcher.h"
+
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h"
-int main(int argc, char** argv) {
- mojo::ViewManagerTestSuite test_suite(argc, argv);
+namespace {
+
+int DummyRunTestSuite(void) {
+ return -1;
+}
+
+} // namespace
- return base::LaunchUnitTests(
- argc, argv, base::Bind(&TestSuite::Run, base::Unretained(&test_suite)));
+int main(int argc, char** argv) {
+ return base::LaunchUnitTests(argc, argv, base::Bind(&DummyRunTestSuite));
}
« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/util/PerfTest.java ('k') | base/time/time.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698