| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "build/build_config.h" |
| 6 #include "chrome/test/remoting/qunit_browser_test_runner.h" | 7 #include "chrome/test/remoting/qunit_browser_test_runner.h" |
| 7 | 8 |
| 8 #if defined(OS_MACOSX) | 9 #if defined(OS_MACOSX) |
| 9 #include "base/mac/foundation_util.h" | 10 #include "base/mac/foundation_util.h" |
| 10 #endif // !defined(OS_MACOSX) | 11 #endif // !defined(OS_MACOSX) |
| 11 | 12 |
| 12 namespace remoting { | 13 namespace remoting { |
| 13 | 14 |
| 14 // Flakily times out on Win7 Tests (dbg): https://crbug.com/504204. | 15 // Flakily times out on Win7 Tests (dbg): https://crbug.com/504204. |
| 15 #if defined(OS_WIN) && !defined(NDEBUG) | 16 #if defined(OS_WIN) && !defined(NDEBUG) |
| (...skipping 10 matching lines...) Expand all Loading... |
| 26 if (base::mac::AmIBundled()) { | 27 if (base::mac::AmIBundled()) { |
| 27 // If we are inside a mac bundle, navigate up to the output directory | 28 // If we are inside a mac bundle, navigate up to the output directory |
| 28 base_dir = base::mac::GetAppBundlePath(base_dir).DirName(); | 29 base_dir = base::mac::GetAppBundlePath(base_dir).DirName(); |
| 29 } | 30 } |
| 30 #endif // !defined(OS_MACOSX) | 31 #endif // !defined(OS_MACOSX) |
| 31 RunTest( | 32 RunTest( |
| 32 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html"))); | 33 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html"))); |
| 33 } | 34 } |
| 34 | 35 |
| 35 } // namespace remoting | 36 } // namespace remoting |
| OLD | NEW |