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 |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "extensions/common/extension_paths.h" | 29 #include "extensions/common/extension_paths.h" |
30 #include "testing/gtest/include/gtest/gtest.h" | 30 #include "testing/gtest/include/gtest/gtest.h" |
31 #include "ui/base/resource/resource_bundle.h" | 31 #include "ui/base/resource/resource_bundle.h" |
32 #include "ui/base/resource/resource_handle.h" | 32 #include "ui/base/resource/resource_handle.h" |
33 | 33 |
34 #if defined(OS_ANDROID) | 34 #if defined(OS_ANDROID) |
35 #include "base/android/jni_android.h" | 35 #include "base/android/jni_android.h" |
36 #include "chrome/browser/android/chrome_jni_registrar.h" | 36 #include "chrome/browser/android/chrome_jni_registrar.h" |
37 #include "net/android/net_jni_registrar.h" | 37 #include "net/android/net_jni_registrar.h" |
38 #include "ui/android/ui_jni_registrar.h" | 38 #include "ui/android/ui_jni_registrar.h" |
| 39 #include "ui/gfx/android/gfx_jni_registrar.h" |
39 #include "ui/gl/android/gl_jni_registrar.h" | 40 #include "ui/gl/android/gl_jni_registrar.h" |
40 #endif | 41 #endif |
41 | 42 |
42 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
43 #include "base/process/process_metrics.h" | 44 #include "base/process/process_metrics.h" |
44 #include "chromeos/chromeos_paths.h" | 45 #include "chromeos/chromeos_paths.h" |
45 #endif | 46 #endif |
46 | 47 |
47 #if defined(OS_MACOSX) | 48 #if defined(OS_MACOSX) |
48 #include "base/mac/bundle_locations.h" | 49 #include "base/mac/bundle_locations.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 void ChromeTestSuite::Initialize() { | 143 void ChromeTestSuite::Initialize() { |
143 #if defined(OS_MACOSX) | 144 #if defined(OS_MACOSX) |
144 base::mac::ScopedNSAutoreleasePool autorelease_pool; | 145 base::mac::ScopedNSAutoreleasePool autorelease_pool; |
145 #if !defined(OS_IOS) | 146 #if !defined(OS_IOS) |
146 chrome_browser_application_mac::RegisterBrowserCrApp(); | 147 chrome_browser_application_mac::RegisterBrowserCrApp(); |
147 #endif // !defined(OS_IOS) | 148 #endif // !defined(OS_IOS) |
148 #endif | 149 #endif |
149 | 150 |
150 #if defined(OS_ANDROID) | 151 #if defined(OS_ANDROID) |
151 // Register JNI bindings for android. | 152 // Register JNI bindings for android. |
| 153 gfx::android::RegisterJni(base::android::AttachCurrentThread()); |
152 net::android::RegisterJni(base::android::AttachCurrentThread()); | 154 net::android::RegisterJni(base::android::AttachCurrentThread()); |
153 ui::android::RegisterJni(base::android::AttachCurrentThread()); | 155 ui::android::RegisterJni(base::android::AttachCurrentThread()); |
154 ui::gl::android::RegisterJni(base::android::AttachCurrentThread()); | 156 ui::gl::android::RegisterJni(base::android::AttachCurrentThread()); |
155 chrome::android::RegisterJni(base::android::AttachCurrentThread()); | 157 chrome::android::RegisterJni(base::android::AttachCurrentThread()); |
156 #endif | 158 #endif |
157 | 159 |
158 chrome::RegisterPathProvider(); | 160 chrome::RegisterPathProvider(); |
159 #if defined(OS_CHROMEOS) | 161 #if defined(OS_CHROMEOS) |
160 chromeos::RegisterPathProvider(); | 162 chromeos::RegisterPathProvider(); |
161 #endif | 163 #endif |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 #if defined(OS_MACOSX) && !defined(OS_IOS) | 235 #if defined(OS_MACOSX) && !defined(OS_IOS) |
234 base::mac::SetOverrideFrameworkBundle(NULL); | 236 base::mac::SetOverrideFrameworkBundle(NULL); |
235 #endif | 237 #endif |
236 | 238 |
237 base::StatsTable::set_current(NULL); | 239 base::StatsTable::set_current(NULL); |
238 stats_table_.reset(); | 240 stats_table_.reset(); |
239 RemoveSharedMemoryFile(stats_filename_); | 241 RemoveSharedMemoryFile(stats_filename_); |
240 | 242 |
241 base::TestSuite::Shutdown(); | 243 base::TestSuite::Shutdown(); |
242 } | 244 } |
OLD | NEW |