diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 17:09:37 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 17:10:44 +0000 |
| commit | cf74402db8af5735815caefe721276c5f9dda7aa (patch) | |
| tree | 02d0a093b75d99d7d2c8a359041648f1167cfc47 /ipc/mojo | |
| parent | 8271001b6f844eee8b8a3fadf0dce9d3f2b4478e (diff) | |
| download | chromium_src-cf74402db8af5735815caefe721276c5f9dda7aa.zip chromium_src-cf74402db8af5735815caefe721276c5f9dda7aa.tar.gz chromium_src-cf74402db8af5735815caefe721276c5f9dda7aa.tar.bz2 | |
Mojo: Add PlatformSupport argument to mojo::embedder::Init().
Also add InitWithSimplePlatformSupport() to test_embedder.h. Use that
for all tests, for now (this won't be right in the long run).
R=darin@chromium.org
Review URL: https://codereview.chromium.org/489593004
Cr-Commit-Position: refs/heads/master@{#290856}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/mojo')
| -rw-r--r-- | ipc/mojo/run_all_unittests.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mojo/run_all_unittests.cc b/ipc/mojo/run_all_unittests.cc index 3270e23..0989bf3 100644 --- a/ipc/mojo/run_all_unittests.cc +++ b/ipc/mojo/run_all_unittests.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" -#include "mojo/embedder/embedder.h" +#include "mojo/embedder/test_embedder.h" #if defined(OS_ANDROID) #include "base/android/jni_android.h" @@ -29,7 +29,7 @@ int RunTestSuite(int argc, char** argv) { } // namespace int main(int argc, char** argv) { - mojo::embedder::Init(); + mojo::embedder::test::InitWithSimplePlatformSupport(); #if defined(OS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); base::RegisterContentUriTestUtils(env); |