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

Unified Diff: mojo/edk/test/multiprocess_test_helper.h

Issue 1485573002: Remove SimpleBroker and instead use the production broker implementation in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix html_viewer_unittests Created 5 years, 1 month 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: mojo/edk/test/multiprocess_test_helper.h
diff --git a/mojo/edk/test/multiprocess_test_helper.h b/mojo/edk/test/multiprocess_test_helper.h
index 3ff8b85ad9aeb8cf4db841d9cfbc6815f1af3cb2..55fef7c73ad1fa80f36a2186839aa1d3f7dac9bd 100644
--- a/mojo/edk/test/multiprocess_test_helper.h
+++ b/mojo/edk/test/multiprocess_test_helper.h
@@ -21,6 +21,8 @@ class PlatformChannelPair;
namespace test {
+extern const char kBrokerHandleSwitch[];
+
class MultiprocessTestHelper {
public:
MultiprocessTestHelper();
@@ -60,8 +62,12 @@ class MultiprocessTestHelper {
static ScopedPlatformHandle client_platform_handle;
private:
+ // Used differently depending on the test.
scoped_ptr<PlatformChannelPair> platform_channel_pair_;
+ // Used by the broker.
+ scoped_ptr<PlatformChannelPair> broker_platform_channel_pair_;
+
// Valid after |StartChild()| and before |WaitForChildShutdown()|.
base::Process test_child_;

Powered by Google App Engine
This is Rietveld 408576698