| Index: ui/views/mus/views_mus_test_suite.cc
|
| diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
|
| index d5b80b5393f92e2d3cf6b5d0f53afb735dceec48..72ed1412016763cd238bc8ad07377d3f23ed4aaf 100644
|
| --- a/ui/views/mus/views_mus_test_suite.cc
|
| +++ b/ui/views/mus/views_mus_test_suite.cc
|
| @@ -15,7 +15,7 @@
|
| #include "services/shell/background/background_shell.h"
|
| #include "services/shell/public/cpp/connector.h"
|
| #include "services/shell/public/cpp/service.h"
|
| -#include "services/shell/public/cpp/shell_connection.h"
|
| +#include "services/shell/public/cpp/service_context.h"
|
| #include "services/ui/common/switches.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/views/mus/window_manager_connection.h"
|
| @@ -117,7 +117,7 @@ class ShellConnection {
|
| background_shell_.reset(new shell::BackgroundShell);
|
| background_shell_->Init(nullptr);
|
| service_.reset(new DefaultService);
|
| - shell_connection_.reset(new shell::ShellConnection(
|
| + shell_connection_.reset(new shell::ServiceContext(
|
| service_.get(),
|
| background_shell_->CreateServiceRequest(GetTestName())));
|
|
|
| @@ -145,7 +145,7 @@ class ShellConnection {
|
|
|
| base::Thread thread_;
|
| std::unique_ptr<shell::BackgroundShell> background_shell_;
|
| - std::unique_ptr<shell::ShellConnection> shell_connection_;
|
| + std::unique_ptr<shell::ServiceContext> shell_connection_;
|
| std::unique_ptr<DefaultService> service_;
|
| std::unique_ptr<shell::Connector> shell_connector_;
|
| shell::Identity shell_identity_;
|
|
|