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

Unified Diff: shell/shell_test_base.h

Issue 815993004: Run shell tests on android. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: move shell_test_base_android.cc Created 6 years 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: shell/shell_test_base.h
diff --git a/shell/shell_test_base.h b/shell/shell_test_base.h
index 7b0b5bbb4531e2024be4261e4e24f006c9629329..ee88c075b3d4f2e53b120a769cc6519800970237 100644
--- a/shell/shell_test_base.h
+++ b/shell/shell_test_base.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/files/file_path.h"
viettrungluu 2014/12/19 18:31:34 I don't think you need this....
qsr 2014/12/22 10:52:32 Done.
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/system/core.h"
@@ -32,27 +33,19 @@ class ShellTestBase : public testing::Test {
ScopedMessagePipeHandle ConnectToService(const GURL& application_url,
const std::string& service_name);
- ScopedMessagePipeHandle ConnectToServiceViaNetwork(
- const GURL& application_url,
- const std::string& service_name);
-
template <typename Interface>
void ConnectToService(const GURL& application_url,
InterfacePtr<Interface>* ptr) {
ptr->Bind(ConnectToService(application_url, Interface::Name_).Pass());
}
- template <typename Interface>
- void ConnectToServiceViaNetwork(const GURL& application_url,
- InterfacePtr<Interface>* ptr) {
- ptr->Bind(
- ConnectToServiceViaNetwork(application_url, Interface::Name_).Pass());
- }
-
base::MessageLoop* message_loop() { return &message_loop_; }
Context* shell_context() { return &shell_context_; }
private:
+ // Set up the test applications so that mojo: URL resolves to those.
+ void SetUpTestApplications();
+
Context shell_context_;
base::MessageLoop message_loop_;

Powered by Google App Engine
This is Rietveld 408576698