Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1617)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/public/test/content_test_suite_base.cc

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename namespace Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/browser/android/compositor.h ('k') | content/test/BUILD.gn » ('j') | ui/android/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/content_test_suite_base.h" 5 #include "content/public/test/content_test_suite_base.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/statistics_recorder.h" 10 #include "base/metrics/statistics_recorder.h"
(...skipping 13 matching lines...) Expand all
24 #include "content/browser/renderer_host/render_process_host_impl.h" 24 #include "content/browser/renderer_host/render_process_host_impl.h"
25 #include "content/browser/utility_process_host_impl.h" 25 #include "content/browser/utility_process_host_impl.h"
26 #endif 26 #endif
27 27
28 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
29 #include "base/android/jni_android.h" 29 #include "base/android/jni_android.h"
30 #include "content/browser/android/browser_jni_registrar.h" 30 #include "content/browser/android/browser_jni_registrar.h"
31 #include "content/common/android/common_jni_registrar.h" 31 #include "content/common/android/common_jni_registrar.h"
32 #include "media/base/android/media_jni_registrar.h" 32 #include "media/base/android/media_jni_registrar.h"
33 #include "net/android/net_jni_registrar.h" 33 #include "net/android/net_jni_registrar.h"
34 #include "ui/android/ui_android_jni_registrar.h"
34 #include "ui/base/android/ui_base_jni_registrar.h" 35 #include "ui/base/android/ui_base_jni_registrar.h"
35 #include "ui/gfx/android/gfx_jni_registrar.h" 36 #include "ui/gfx/android/gfx_jni_registrar.h"
36 #include "ui/gl/android/gl_jni_registrar.h" 37 #include "ui/gl/android/gl_jni_registrar.h"
37 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 38 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
38 #endif 39 #endif
39 40
40 #if defined(USE_OZONE) 41 #if defined(USE_OZONE)
41 #include "ui/ozone/public/ozone_platform.h" 42 #include "ui/ozone/public/ozone_platform.h"
42 #endif 43 #endif
43 44
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 77
77 #if defined(OS_ANDROID) 78 #if defined(OS_ANDROID)
78 // Register JNI bindings for android. 79 // Register JNI bindings for android.
79 JNIEnv* env = base::android::AttachCurrentThread(); 80 JNIEnv* env = base::android::AttachCurrentThread();
80 content::android::RegisterCommonJni(env); 81 content::android::RegisterCommonJni(env);
81 content::android::RegisterBrowserJni(env); 82 content::android::RegisterBrowserJni(env);
82 gfx::android::RegisterJni(env); 83 gfx::android::RegisterJni(env);
83 media::RegisterJni(env); 84 media::RegisterJni(env);
84 net::android::RegisterJni(env); 85 net::android::RegisterJni(env);
85 ui::android::RegisterJni(env); 86 ui::android::RegisterJni(env);
87 ui::RegisterUIAndroidJni(env);
86 ui::gl::android::RegisterJni(env); 88 ui::gl::android::RegisterJni(env);
87 ui::shell_dialogs::RegisterJni(env); 89 ui::shell_dialogs::RegisterJni(env);
88 #endif 90 #endif
89 91
90 #if defined(USE_OZONE) 92 #if defined(USE_OZONE)
91 ui::OzonePlatform::InitializeForUI(); 93 ui::OzonePlatform::InitializeForUI();
92 #endif 94 #endif
93 95
94 testing::UnitTest::GetInstance()->listeners().Append( 96 testing::UnitTest::GetInstance()->listeners().Append(
95 new ContentTestSuiteBaseListener); 97 new ContentTestSuiteBaseListener);
(...skipping 10 matching lines...) Expand all
106 #if !defined(OS_IOS) 108 #if !defined(OS_IOS)
107 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( 109 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
108 CreateInProcessUtilityThread); 110 CreateInProcessUtilityThread);
109 RenderProcessHostImpl::RegisterRendererMainThreadFactory( 111 RenderProcessHostImpl::RegisterRendererMainThreadFactory(
110 CreateInProcessRendererThread); 112 CreateInProcessRendererThread);
111 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); 113 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
112 #endif 114 #endif
113 } 115 }
114 116
115 } // namespace content 117 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/android/compositor.h ('k') | content/test/BUILD.gn » ('j') | ui/android/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698