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

Unified Diff: mojo/shell/shell_test_base.h

Issue 397733003: mojo: kill app_thread before unloading main app library and add tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: also service_manager_unittests 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
« no previous file with comments | « mojo/shell/mojo_url_resolver.cc ('k') | mojo/shell/shell_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/shell_test_base.h
diff --git a/mojo/shell/shell_test_base.h b/mojo/shell/shell_test_base.h
index 52538a7eb67f379f0e0338a05a1dd704932328a2..eb446ecee6d67a0aba8e339f41f04f161eb411f7 100644
--- a/mojo/shell/shell_test_base.h
+++ b/mojo/shell/shell_test_base.h
@@ -15,6 +15,12 @@
class GURL;
+namespace net {
+namespace test_server {
+class EmbeddedTestServer;
+}
+} // namespace net
+
namespace mojo {
namespace shell {
namespace test {
@@ -24,6 +30,8 @@ class ShellTestBase : public testing::Test {
ShellTestBase();
virtual ~ShellTestBase();
+ virtual void SetUp() OVERRIDE;
+
// |application_url| should typically be a mojo: URL (the origin will be set
// to an "appropriate" file: URL).
// TODO(tim): Should the test base be a ServiceProvider?
@@ -31,10 +39,15 @@ class ShellTestBase : public testing::Test {
const GURL& application_url,
const std::string& service_name);
+ ScopedMessagePipeHandle ConnectToServiceViaNetwork(
+ const GURL& application_url,
+ const std::string& service_name);
+
base::MessageLoop* message_loop() { return &message_loop_; }
Context* shell_context() { return &shell_context_; }
private:
+ scoped_ptr<net::test_server::EmbeddedTestServer> test_server_;
base::MessageLoop message_loop_;
Context shell_context_;
« no previous file with comments | « mojo/shell/mojo_url_resolver.cc ('k') | mojo/shell/shell_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698