summaryrefslogtreecommitdiffstats
path: root/mojo/public/cpp/application/application_test_base.h
diff options
context:
space:
mode:
authorjamesr <jamesr@chromium.org>2014-10-31 15:08:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-31 22:08:55 +0000
commit904ce270798bd27f4f6fa4348838b00ee6e9a408 (patch)
treec697c74b2cc1cf2f286bfcad6c9340a3a7df4fe4 /mojo/public/cpp/application/application_test_base.h
parent82c6af625500a7bfdcf9f619c4e5702fa12f2b40 (diff)
downloadchromium_src-904ce270798bd27f4f6fa4348838b00ee6e9a408.zip
chromium_src-904ce270798bd27f4f6fa4348838b00ee6e9a408.tar.gz
chromium_src-904ce270798bd27f4f6fa4348838b00ee6e9a408.tar.bz2
Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b
Also includes changes from https://codereview.chromium.org/695953002/ to update html_viewer for API changes. Review URL: https://codereview.chromium.org/694923002 Cr-Commit-Position: refs/heads/master@{#302333}
Diffstat (limited to 'mojo/public/cpp/application/application_test_base.h')
-rw-r--r--mojo/public/cpp/application/application_test_base.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/mojo/public/cpp/application/application_test_base.h b/mojo/public/cpp/application/application_test_base.h
index 7fe38d2..2f400a4 100644
--- a/mojo/public/cpp/application/application_test_base.h
+++ b/mojo/public/cpp/application/application_test_base.h
@@ -17,6 +17,10 @@ class ApplicationImpl;
namespace test {
+// Access the shell handle shared by multiple test application instances.
+ScopedMessagePipeHandle PassShellHandle();
+void SetShellHandle(ScopedMessagePipeHandle handle);
+
// A GTEST base class for application testing executed in mojo_shell.
class ApplicationTestBase : public testing::Test {
public: