| 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" |
| 11 #include "base/scoped_temp_dir.h" | |
| 12 #include "base/test/test_suite.h" | 11 #include "base/test/test_suite.h" |
| 13 #include "content/public/app/content_main.h" | 12 #include "content/public/app/content_main.h" |
| 14 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
| 15 #include "content/public/test/content_test_suite_base.h" | 14 #include "content/public/test/content_test_suite_base.h" |
| 16 #include "content/shell/shell_content_browser_client.h" | 15 #include "content/shell/shell_content_browser_client.h" |
| 17 #include "content/shell/shell_content_client.h" | 16 #include "content/shell/shell_content_client.h" |
| 18 #include "content/shell/shell_main_delegate.h" | 17 #include "content/shell/shell_main_delegate.h" |
| 18 #include "content/shell/shell_switches.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 20 | 20 |
| 21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 22 #include "content/public/app/startup_helper_win.h" | 22 #include "content/public/app/startup_helper_win.h" |
| 23 #include "sandbox/win/src/sandbox_types.h" | 23 #include "sandbox/win/src/sandbox_types.h" |
| 24 #include "ui/base/win/scoped_ole_initializer.h" | 24 #include "ui/base/win/scoped_ole_initializer.h" |
| 25 #endif // defined(OS_WIN) | 25 #endif // defined(OS_WIN) |
| 26 | 26 |
| 27 namespace content { | 27 namespace content { |
| 28 | 28 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 #endif // defined(OS_WIN) || defined(OS_LINUX) | 114 #endif // defined(OS_WIN) || defined(OS_LINUX) |
| 115 | 115 |
| 116 return false; | 116 return false; |
| 117 } | 117 } |
| 118 | 118 |
| 119 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { | 119 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { |
| 120 return ContentBrowserTestSuite(argc, argv).Run(); | 120 return ContentBrowserTestSuite(argc, argv).Run(); |
| 121 } | 121 } |
| 122 | 122 |
| 123 virtual bool AdjustChildProcessCommandLine( | 123 virtual bool AdjustChildProcessCommandLine( |
| 124 CommandLine* command_line) OVERRIDE { | 124 CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE { |
| 125 command_line->AppendSwitchPath(switches::kContentShellDataPath, |
| 126 temp_data_dir); |
| 125 return true; | 127 return true; |
| 126 } | 128 } |
| 127 | 129 |
| 128 private: | 130 private: |
| 129 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); | 131 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); |
| 130 }; | 132 }; |
| 131 | 133 |
| 132 } // namespace content | 134 } // namespace content |
| 133 | 135 |
| 134 int main(int argc, char** argv) { | 136 int main(int argc, char** argv) { |
| 135 content::ContentTestLauncherDelegate launcher_delegate; | 137 content::ContentTestLauncherDelegate launcher_delegate; |
| 136 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); | 138 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); |
| 137 } | 139 } |
| OLD | NEW |