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

Unified Diff: third_party/mojo/src/mojo/public/cpp/application/application_test_base.h

Issue 883843002: Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 5 years, 11 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: third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h b/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
index bdf2f8bfb9eca6a46314db46a70d99cc1a0f16b3..10763be4bf36dcbb561ccb3a162a1f2335cbab4f 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
@@ -9,6 +9,7 @@
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/cpp/system/macros.h"
+#include "mojo/public/interfaces/application/application.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
@@ -22,7 +23,7 @@ const Array<String>& Args();
// Run all application tests. This must be called after the environment is
// initialized, to support construction of a default run loop.
-MojoResult RunAllTests(MojoHandle shell_handle);
+MojoResult RunAllTests(MojoHandle application_request_handle);
// A GTEST base class for application testing executed in mojo_shell.
class ApplicationTestBase : public testing::Test {
@@ -36,10 +37,6 @@ class ApplicationTestBase : public testing::Test {
// Get the ApplicationDelegate for the application to be tested.
virtual ApplicationDelegate* GetApplicationDelegate();
- // A testing::Test::SetUp helper to override the application command
- // line arguments.
- void SetUpWithArgs(const Array<String>& args);
-
// testing::Test:
void SetUp() override;
void TearDown() override;

Powered by Google App Engine
This is Rietveld 408576698