diff options
| author | jam <jam@chromium.org> | 2015-05-14 15:56:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-14 22:56:18 +0000 |
| commit | 05a3de409c2653028aede6a467bb70c0addf57fc (patch) | |
| tree | 77329d790a38ff6aed7d8f9ae1d17e169887057a /media/test | |
| parent | 067d014b8f1918db09939aa765bdfa7576ab3d50 (diff) | |
| download | chromium_src-05a3de409c2653028aede6a467bb70c0addf57fc.zip chromium_src-05a3de409c2653028aede6a467bb70c0addf57fc.tar.gz chromium_src-05a3de409c2653028aede6a467bb70c0addf57fc.tar.bz2 | |
Fork the mojo shell interfaces used by Mandoline.
Per in-person discussions, as long as we have a fork of mojo shell we'll fork the interfaces.
I'll do third_party/mojo/src/mojo/public/java/application in a followup.
TBR=tsepez
Review URL: https://codereview.chromium.org/1139123006
Cr-Commit-Position: refs/heads/master@{#329965}
Diffstat (limited to 'media/test')
| -rw-r--r-- | media/test/DEPS | 2 | ||||
| -rw-r--r-- | media/test/pipeline_integration_test.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/test/DEPS b/media/test/DEPS index 5f8633a..e402e7f 100644 --- a/media/test/DEPS +++ b/media/test/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+third_party/mojo/src/mojo/public", + "+mojo/application/public/cpp", ] diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index dd214eb..5af6938 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -26,9 +26,9 @@ #if defined(MOJO_RENDERER) #include "media/mojo/services/mojo_renderer_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_test_base.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/application_test_base.h" +#include "mojo/application/public/cpp/connect.h" // TODO(dalecurtis): The mojo renderer is in another process, so we have no way // currently to get hashes for video and audio samples. This also means that |