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 "chrome/test/base/chrome_test_suite.h" | 5 #include "chrome/test/base/chrome_test_suite.h" |
6 | 6 |
7 #if defined(OS_CHROMEOS) | 7 #if defined(OS_CHROMEOS) |
8 #include <stdio.h> | 8 #include <stdio.h> |
9 #include <unistd.h> | 9 #include <unistd.h> |
10 #endif | 10 #endif |
11 | 11 |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
18 #include "chrome/common/chrome_paths.h" | 18 #include "chrome/common/chrome_paths.h" |
19 #include "chrome/common/content_settings_pattern.h" | |
20 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
| 20 #include "components/content_settings/core/common/content_settings_pattern.h" |
21 #include "content/public/test/test_launcher.h" | 21 #include "content/public/test/test_launcher.h" |
22 #include "extensions/common/constants.h" | 22 #include "extensions/common/constants.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
24 | 24 |
25 #if defined(OS_ANDROID) | 25 #if defined(OS_ANDROID) |
26 #include "base/android/jni_android.h" | 26 #include "base/android/jni_android.h" |
27 #include "chrome/browser/android/chrome_jni_registrar.h" | 27 #include "chrome/browser/android/chrome_jni_registrar.h" |
28 #include "net/android/net_jni_registrar.h" | 28 #include "net/android/net_jni_registrar.h" |
29 #include "ui/base/android/ui_base_jni_registrar.h" | 29 #include "ui/base/android/ui_base_jni_registrar.h" |
30 #include "ui/gfx/android/gfx_jni_registrar.h" | 30 #include "ui/gfx/android/gfx_jni_registrar.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 #endif | 120 #endif |
121 } | 121 } |
122 | 122 |
123 void ChromeTestSuite::Shutdown() { | 123 void ChromeTestSuite::Shutdown() { |
124 #if defined(OS_MACOSX) && !defined(OS_IOS) | 124 #if defined(OS_MACOSX) && !defined(OS_IOS) |
125 base::mac::SetOverrideFrameworkBundle(NULL); | 125 base::mac::SetOverrideFrameworkBundle(NULL); |
126 #endif | 126 #endif |
127 | 127 |
128 content::ContentTestSuiteBase::Shutdown(); | 128 content::ContentTestSuiteBase::Shutdown(); |
129 } | 129 } |
OLD | NEW |