| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
| 8 #include "base/test/test_io_thread.h" |
| 8 #include "base/test/test_suite.h" | 9 #include "base/test/test_suite.h" |
| 9 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "mojo/edk/embedder/embedder.h" |
| 10 | 12 |
| 11 #if defined(OS_ANDROID) | 13 #if defined(OS_ANDROID) |
| 12 #include "gpu/ipc/client/android/in_process_surface_texture_manager.h" | 14 #include "gpu/ipc/client/android/in_process_surface_texture_manager.h" |
| 13 #endif | 15 #endif |
| 14 | 16 |
| 15 namespace { | 17 namespace { |
| 16 | 18 |
| 17 class GpuTestSuite : public base::TestSuite { | 19 class GpuTestSuite : public base::TestSuite { |
| 18 public: | 20 public: |
| 19 GpuTestSuite(int argc, char** argv); | 21 GpuTestSuite(int argc, char** argv); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 38 gpu::InProcessSurfaceTextureManager::GetInstance()); | 40 gpu::InProcessSurfaceTextureManager::GetInstance()); |
| 39 #endif | 41 #endif |
| 40 } | 42 } |
| 41 | 43 |
| 42 } // namespace | 44 } // namespace |
| 43 | 45 |
| 44 int main(int argc, char** argv) { | 46 int main(int argc, char** argv) { |
| 45 base::CommandLine::Init(argc, argv); | 47 base::CommandLine::Init(argc, argv); |
| 46 GpuTestSuite test_suite(argc, argv); | 48 GpuTestSuite test_suite(argc, argv); |
| 47 | 49 |
| 50 mojo::edk::Init(); |
| 51 |
| 48 return base::LaunchUnitTests( | 52 return base::LaunchUnitTests( |
| 49 argc, argv, | 53 argc, argv, |
| 50 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 54 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
| 51 } | 55 } |
| OLD | NEW |