| Index: media/mojo/services/media_apptest.cc
|
| diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc
|
| index 27b525d95645bb4caf2bfe62051e1857139d9a41..0d88334f79ca4211fd196a63ad76997218e8fcae 100644
|
| --- a/media/mojo/services/media_apptest.cc
|
| +++ b/media/mojo/services/media_apptest.cc
|
| @@ -20,7 +20,6 @@
|
| #include "media/mojo/interfaces/service_factory.mojom.h"
|
| #include "media/mojo/services/media_type_converters.h"
|
| #include "media/mojo/services/mojo_demuxer_stream_impl.h"
|
| -#include "mojo/shell/public/cpp/application_connection.h"
|
| #include "mojo/shell/public/cpp/application_test_base.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| @@ -124,7 +123,7 @@ class MediaAppTest : public mojo::test::ApplicationTestBase {
|
| StrictMock<MockDemuxerStream> video_demuxer_stream_;
|
|
|
| private:
|
| - scoped_ptr<mojo::ApplicationConnection> connection_;
|
| + scoped_ptr<mojo::Connection> connection_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MediaAppTest);
|
| };
|
|
|