| 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 "content/public/test/test_launcher.h" | 5 #include "content/public/test/test_launcher.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 return true; | 125 return true; |
| 126 } | 126 } |
| 127 | 127 |
| 128 private: | 128 private: |
| 129 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); | 129 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); |
| 130 }; | 130 }; |
| 131 | 131 |
| 132 } // namespace content | 132 } // namespace content |
| 133 | 133 |
| 134 int main(int argc, char** argv) { | 134 int main(int argc, char** argv) { |
| 135 #if defined(USE_AURA) | |
| 136 LOG(INFO) << "content_browsertests not supported on aura yet."; | |
| 137 return 0; | |
| 138 #endif | |
| 139 content::ContentTestLauncherDelegate launcher_delegate; | 135 content::ContentTestLauncherDelegate launcher_delegate; |
| 140 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); | 136 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); |
| 141 } | 137 } |
| OLD | NEW |