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 <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
22 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
23 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
24 #include "base/test/launcher/test_launcher.h" | 24 #include "base/test/launcher/test_launcher.h" |
25 #include "base/test/test_suite.h" | 25 #include "base/test/test_suite.h" |
26 #include "base/test/test_switches.h" | 26 #include "base/test/test_switches.h" |
27 #include "base/test/test_timeouts.h" | 27 #include "base/test/test_timeouts.h" |
28 #include "base/time/time.h" | 28 #include "base/time/time.h" |
29 #include "content/public/app/content_main.h" | 29 #include "content/public/app/content_main.h" |
30 #include "content/public/app/content_main_delegate.h" | 30 #include "content/public/app/content_main_delegate.h" |
31 #include "content/public/app/startup_helper_win.h" | |
32 #include "content/public/common/content_switches.h" | 31 #include "content/public/common/content_switches.h" |
33 #include "content/public/common/sandbox_init.h" | 32 #include "content/public/common/sandbox_init.h" |
34 #include "content/public/test/browser_test.h" | 33 #include "content/public/test/browser_test.h" |
35 #include "net/base/escape.h" | 34 #include "net/base/escape.h" |
36 #include "testing/gtest/include/gtest/gtest.h" | 35 #include "testing/gtest/include/gtest/gtest.h" |
37 | 36 |
38 #if defined(OS_WIN) | 37 #if defined(OS_WIN) |
39 #include "base/base_switches.h" | 38 #include "base/base_switches.h" |
40 #include "content/common/sandbox_win.h" | 39 #include "content/common/sandbox_win.h" |
| 40 #include "content/public/app/sandbox_helper_win.h" |
41 #include "sandbox/win/src/sandbox_factory.h" | 41 #include "sandbox/win/src/sandbox_factory.h" |
42 #include "sandbox/win/src/sandbox_types.h" | 42 #include "sandbox/win/src/sandbox_types.h" |
43 #elif defined(OS_MACOSX) | 43 #elif defined(OS_MACOSX) |
44 #include "base/mac/scoped_nsautorelease_pool.h" | 44 #include "base/mac/scoped_nsautorelease_pool.h" |
45 #endif | 45 #endif |
46 | 46 |
47 namespace content { | 47 namespace content { |
48 | 48 |
49 namespace { | 49 namespace { |
50 | 50 |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 | 509 |
510 TestLauncherDelegate* GetCurrentTestLauncherDelegate() { | 510 TestLauncherDelegate* GetCurrentTestLauncherDelegate() { |
511 return g_launcher_delegate; | 511 return g_launcher_delegate; |
512 } | 512 } |
513 | 513 |
514 ContentMainParams* GetContentMainParams() { | 514 ContentMainParams* GetContentMainParams() { |
515 return g_params; | 515 return g_params; |
516 } | 516 } |
517 | 517 |
518 } // namespace content | 518 } // namespace content |
OLD | NEW |