diff options
| author | ben <ben@chromium.org> | 2016-03-14 23:15:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-15 06:17:29 +0000 |
| commit | d60d1ca7b4209607aaf7a3a95bb6d4a21db49f0e (patch) | |
| tree | eb0c2f2e9f595b19065661d7e88f91cf8854da0a /mojo/shell | |
| parent | 27eb4409b17331235123e5e0a6837aa760203816 (diff) | |
| download | chromium_src-d60d1ca7b4209607aaf7a3a95bb6d4a21db49f0e.zip chromium_src-d60d1ca7b4209607aaf7a3a95bb6d4a21db49f0e.tar.gz chromium_src-d60d1ca7b4209607aaf7a3a95bb6d4a21db49f0e.tar.bz2 | |
Convert net apptests to net unittests using mojo::ShellTest.
R=yzshen@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1796313002
Cr-Commit-Position: refs/heads/master@{#381183}
Diffstat (limited to 'mojo/shell')
| -rw-r--r-- | mojo/shell/public/cpp/lib/shell_test.cc | 6 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/shell_test.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mojo/shell/public/cpp/lib/shell_test.cc b/mojo/shell/public/cpp/lib/shell_test.cc index 402d750..e5cb3c2 100644 --- a/mojo/shell/public/cpp/lib/shell_test.cc +++ b/mojo/shell/public/cpp/lib/shell_test.cc @@ -32,6 +32,10 @@ scoped_ptr<ShellClient> ShellTest::CreateShellClient() { return make_scoped_ptr(new ShellTestClient(this)); } +scoped_ptr<base::MessageLoop> ShellTest::CreateMessageLoop() { + return make_scoped_ptr(new base::MessageLoop); +} + void ShellTest::InitializeCalled(Connector* connector, const std::string& name, const std::string& user_id, @@ -44,7 +48,7 @@ void ShellTest::InitializeCalled(Connector* connector, void ShellTest::SetUp() { shell_client_ = CreateShellClient(); - message_loop_.reset(new base::MessageLoop); + message_loop_ = CreateMessageLoop(); background_shell_.reset(new shell::BackgroundShell); background_shell_->Init(nullptr); shell_connection_.reset(new ShellConnection( diff --git a/mojo/shell/public/cpp/shell_test.h b/mojo/shell/public/cpp/shell_test.h index 9157b676..ee85d12 100644 --- a/mojo/shell/public/cpp/shell_test.h +++ b/mojo/shell/public/cpp/shell_test.h @@ -71,6 +71,8 @@ class ShellTest : public testing::Test { // work. virtual scoped_ptr<ShellClient> CreateShellClient(); + virtual scoped_ptr<base::MessageLoop> CreateMessageLoop(); + // Call to set Initialize() metadata when GetShellClient() is overridden. void InitializeCalled(Connector* connector, const std::string& name, |