| Index: components/mus/ws/window_tree_client_unittest.cc
|
| diff --git a/components/mus/ws/window_tree_client_unittest.cc b/components/mus/ws/window_tree_client_unittest.cc
|
| index 68c4bbc660e82d96086aeb0e2e54d9674c57f98e..db7b86b72b299cc477900ba6f3115c96d9ce5b25 100644
|
| --- a/components/mus/ws/window_tree_client_unittest.cc
|
| +++ b/components/mus/ws/window_tree_client_unittest.cc
|
| @@ -21,10 +21,10 @@
|
|
|
| using mojo::Array;
|
| using mojo::Callback;
|
| -using mojo::Connection;
|
| +using shell::Connection;
|
| using mojo::InterfaceRequest;
|
| using mojo::RectPtr;
|
| -using mojo::ShellClient;
|
| +using shell::ShellClient;
|
| using mojo::String;
|
| using mus::mojom::ErrorCode;
|
| using mus::mojom::EventPtr;
|
| @@ -64,7 +64,7 @@ void EmbedCallbackImpl(base::RunLoop* run_loop,
|
|
|
| // -----------------------------------------------------------------------------
|
|
|
| -bool EmbedUrl(mojo::Connector* connector,
|
| +bool EmbedUrl(shell::Connector* connector,
|
| WindowTree* tree,
|
| const String& url,
|
| Id root_id) {
|
| @@ -444,7 +444,7 @@ class TestWindowTreeClientImpl : public mojom::WindowTreeClient,
|
|
|
| // InterfaceFactory for vending TestWindowTreeClientImpls.
|
| class WindowTreeClientFactory
|
| - : public mojo::InterfaceFactory<WindowTreeClient> {
|
| + : public shell::InterfaceFactory<WindowTreeClient> {
|
| public:
|
| WindowTreeClientFactory() {}
|
| ~WindowTreeClientFactory() override {}
|
| @@ -573,7 +573,7 @@ class WindowTreeClientTest : public WindowServerShellTestBase {
|
| }
|
|
|
| // WindowServerShellTestBase:
|
| - bool AcceptConnection(mojo::Connection* connection) override {
|
| + bool AcceptConnection(shell::Connection* connection) override {
|
| connection->AddInterface(client_factory_.get());
|
| return true;
|
| }
|
|
|