| Index: services/shell/connect_util.cc
|
| diff --git a/services/shell/connect_util.cc b/services/shell/connect_util.cc
|
| index cf477ac12f8589962a4eb7ceedb2022ff888acae..45b468ec1020fb875a8dc53fb45130e198f994f5 100644
|
| --- a/services/shell/connect_util.cc
|
| +++ b/services/shell/connect_util.cc
|
| @@ -4,29 +4,28 @@
|
|
|
| #include "services/shell/connect_util.h"
|
|
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "services/shell/connect_params.h"
|
| #include "services/shell/shell.h"
|
|
|
| -namespace mojo {
|
| namespace shell {
|
|
|
| -ScopedMessagePipeHandle ConnectToInterfaceByName(
|
| +mojo::ScopedMessagePipeHandle ConnectToInterfaceByName(
|
| Shell* shell,
|
| const Identity& source,
|
| const Identity& target,
|
| const std::string& interface_name) {
|
| - shell::mojom::InterfaceProviderPtr remote_interfaces;
|
| - scoped_ptr<ConnectParams> params(new ConnectParams);
|
| + mojom::InterfaceProviderPtr remote_interfaces;
|
| + std::unique_ptr<ConnectParams> params(new ConnectParams);
|
| params->set_source(source);
|
| params->set_target(target);
|
| - params->set_remote_interfaces(GetProxy(&remote_interfaces));
|
| + params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces));
|
| shell->Connect(std::move(params));
|
| - MessagePipe pipe;
|
| + mojo::MessagePipe pipe;
|
| remote_interfaces->GetInterface(interface_name, std::move(pipe.handle1));
|
| return std::move(pipe.handle0);
|
| }
|
|
|
| } // namespace shell
|
| -} // namespace mojo
|
|
|