Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(982)

Unified Diff: media/mojo/services/media_apptest.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/main.cc ('k') | media/mojo/services/mojo_cdm_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/media_apptest.cc
diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc
index 63b44f5e4414ed6aa737cb0f1d49a71d25ae4300..091fb2443871b9249deb40567994bad6e21d502c 100644
--- a/media/mojo/services/media_apptest.cc
+++ b/media/mojo/services/media_apptest.cc
@@ -52,7 +52,7 @@ class MockRendererClient : public interfaces::RendererClient {
DISALLOW_COPY_AND_ASSIGN(MockRendererClient);
};
-class MediaAppTest : public mojo::test::ApplicationTestBase {
+class MediaAppTest : public shell::test::ApplicationTestBase {
public:
MediaAppTest()
: renderer_client_binding_(&renderer_client_),
@@ -128,7 +128,7 @@ class MediaAppTest : public mojo::test::ApplicationTestBase {
StrictMock<MockDemuxerStream> video_demuxer_stream_;
private:
- std::unique_ptr<mojo::Connection> connection_;
+ std::unique_ptr<shell::Connection> connection_;
DISALLOW_COPY_AND_ASSIGN(MediaAppTest);
};
« no previous file with comments | « media/mojo/services/main.cc ('k') | media/mojo/services/mojo_cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698