| Index: mash/webtest/webtest.cc
|
| diff --git a/mash/webtest/webtest.cc b/mash/webtest/webtest.cc
|
| index 934e0312e6438e2c7a0e7cd8bec5d527455aa18e..59e2bf81020d220b9e11da2e59643b4919cac106 100644
|
| --- a/mash/webtest/webtest.cc
|
| +++ b/mash/webtest/webtest.cc
|
| @@ -156,16 +156,16 @@ void Webtest::RemoveWindow(views::Widget* window) {
|
| base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| -void Webtest::OnStart(const service_manager::Identity& identity) {
|
| - tracing_.Initialize(connector(), identity.name());
|
| +void Webtest::OnStart(const service_manager::ServiceInfo& info) {
|
| + tracing_.Initialize(connector(), info.identity.name());
|
|
|
| aura_init_.reset(
|
| new views::AuraInit(connector(), "views_mus_resources.pak"));
|
| window_manager_connection_ =
|
| - views::WindowManagerConnection::Create(connector(), identity);
|
| + views::WindowManagerConnection::Create(connector(), info.identity);
|
| }
|
|
|
| -bool Webtest::OnConnect(const service_manager::Identity& remote_identity,
|
| +bool Webtest::OnConnect(const service_manager::ServiceInfo& remote_info,
|
| service_manager::InterfaceRegistry* registry) {
|
| registry->AddInterface<mojom::Launchable>(this);
|
| return true;
|
|
|