| Index: components/mus/public/cpp/tests/window_server_shelltest_base.cc
|
| diff --git a/components/mus/public/cpp/tests/window_server_shelltest_base.cc b/components/mus/public/cpp/tests/window_server_shelltest_base.cc
|
| index 74197fa1b1f18e6f3907702e231ec7bae96afbdb..3f97150a32244986f66cf6d7a507c80293bf19f2 100644
|
| --- a/components/mus/public/cpp/tests/window_server_shelltest_base.cc
|
| +++ b/components/mus/public/cpp/tests/window_server_shelltest_base.cc
|
| @@ -18,15 +18,15 @@ namespace {
|
|
|
| const char kTestAppName[] = "mojo:mus_ws_unittests_app";
|
|
|
| -class WindowServerShellTestClient : public mojo::test::ShellTestClient {
|
| +class WindowServerShellTestClient : public shell::test::ShellTestClient {
|
| public:
|
| explicit WindowServerShellTestClient(WindowServerShellTestBase* test)
|
| : ShellTestClient(test), test_(test) {}
|
| ~WindowServerShellTestClient() override {}
|
|
|
| private:
|
| - // mojo::test::ShellTestClient:
|
| - bool AcceptConnection(mojo::Connection* connection) override {
|
| + // shell::test::ShellTestClient:
|
| + bool AcceptConnection(shell::Connection* connection) override {
|
| return test_->AcceptConnection(connection);
|
| }
|
|
|
| @@ -51,7 +51,7 @@ WindowServerShellTestBase::WindowServerShellTestBase()
|
|
|
| WindowServerShellTestBase::~WindowServerShellTestBase() {}
|
|
|
| -scoped_ptr<mojo::ShellClient> WindowServerShellTestBase::CreateShellClient() {
|
| +scoped_ptr<shell::ShellClient> WindowServerShellTestBase::CreateShellClient() {
|
| return make_scoped_ptr(new WindowServerShellTestClient(this));
|
| }
|
|
|
|
|