| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/shell/public/cpp/shell_test.h" | 5 #include "services/shell/public/cpp/shell_test.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "mojo/shell/background/background_shell.h" | 9 #include "services/shell/background/background_shell.h" |
| 10 #include "mojo/shell/public/cpp/shell_client.h" | 10 #include "services/shell/public/cpp/shell_client.h" |
| 11 | 11 |
| 12 namespace mojo { | 12 namespace mojo { |
| 13 namespace test { | 13 namespace test { |
| 14 | 14 |
| 15 ShellTestClient::ShellTestClient(ShellTest* test) : test_(test) {} | 15 ShellTestClient::ShellTestClient(ShellTest* test) : test_(test) {} |
| 16 ShellTestClient::~ShellTestClient() {} | 16 ShellTestClient::~ShellTestClient() {} |
| 17 | 17 |
| 18 void ShellTestClient::Initialize(Connector* connector, const Identity& identity, | 18 void ShellTestClient::Initialize(Connector* connector, const Identity& identity, |
| 19 uint32_t id) { | 19 uint32_t id) { |
| 20 test_->InitializeCalled(connector, identity.name(), identity.user_id(), id); | 20 test_->InitializeCalled(connector, identity.name(), identity.user_id(), id); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 void ShellTest::TearDown() { | 72 void ShellTest::TearDown() { |
| 73 shell_connection_.reset(); | 73 shell_connection_.reset(); |
| 74 background_shell_.reset(); | 74 background_shell_.reset(); |
| 75 message_loop_.reset(); | 75 message_loop_.reset(); |
| 76 shell_client_.reset(); | 76 shell_client_.reset(); |
| 77 } | 77 } |
| 78 | 78 |
| 79 } // namespace test | 79 } // namespace test |
| 80 } // namespace mojo | 80 } // namespace mojo |
| OLD | NEW |