| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ash/test/test_suite.h" | 5 #include "ash/test/test_suite.h" | 
| 6 #include "base/bind.h" | 6 #include "base/bind.h" | 
| 7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" | 
| 8 | 8 | 
|  | 9 #if !defined(OS_IOS) | 
|  | 10 #include "mojo/edk/embedder/embedder.h" | 
|  | 11 #endif | 
|  | 12 | 
| 9 int main(int argc, char** argv) { | 13 int main(int argc, char** argv) { | 
| 10   ash::test::AuraShellTestSuite test_suite(argc, argv); | 14   ash::test::AuraShellTestSuite test_suite(argc, argv); | 
| 11 | 15 | 
|  | 16 #if !defined(OS_IOS) | 
|  | 17   mojo::edk::Init(); | 
|  | 18 #endif | 
|  | 19 | 
| 12   return base::LaunchUnitTestsSerially( | 20   return base::LaunchUnitTestsSerially( | 
| 13       argc, argv, base::Bind(&ash::test::AuraShellTestSuite::Run, | 21       argc, argv, base::Bind(&ash::test::AuraShellTestSuite::Run, | 
| 14                              base::Unretained(&test_suite))); | 22                              base::Unretained(&test_suite))); | 
| 15 } | 23 } | 
| OLD | NEW | 
|---|