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

Side by Side Diff: content/test/run_all_unittests.cc

Issue 1274763003: Initialize GPU shader disk cache on brower thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address content_unittests failure on Android Created 5 years, 4 months 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/content_browser_client.cc ('k') | no next file » | no next file with comments »
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/test/launcher/unit_test_launcher.h" 6 #include "base/test/launcher/unit_test_launcher.h"
7 #include "content/app/mojo/mojo_init.h" 7 #include "content/app/mojo/mojo_init.h"
8 #include "content/public/test/unittest_test_suite.h" 8 #include "content/public/test/unittest_test_suite.h"
9 #include "content/test/content_test_suite.h" 9 #include "content/test/content_test_suite.h"
10 10
11 #if defined(OS_ANDROID) 11 #if defined(OS_ANDROID)
12 #include "base/android/jni_android.h" 12 #include "base/android/jni_android.h"
13 #include "base/test/test_file_util.h" 13 #include "base/test/test_file_util.h"
14 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 14 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
15 #endif 15 #endif
16 16
17 int main(int argc, char** argv) { 17 int main(int argc, char** argv) {
18 #if defined(OS_ANDROID) 18 #if defined(OS_ANDROID)
19 // Register JNI bindings for android. 19 // Register JNI bindings for android.
20 base::RegisterContentUriTestUtils(base::android::AttachCurrentThread()); 20 base::RegisterContentUriTestUtils(base::android::AttachCurrentThread());
21
22 // Android wants to call GetChannelId() (even though GPU channels
23 // are not getting created in content_unittests).
24 content::BrowserGpuChannelHostFactory::Initialize(false);
25 #endif 21 #endif
26 #if !defined(OS_IOS) 22 #if !defined(OS_IOS)
27 content::InitializeMojo(); 23 content::InitializeMojo();
28 #endif 24 #endif
29 content::UnitTestTestSuite test_suite( 25 content::UnitTestTestSuite test_suite(
30 new content::ContentTestSuite(argc, argv)); 26 new content::ContentTestSuite(argc, argv));
31 27
32 return base::LaunchUnitTests( 28 return base::LaunchUnitTests(
33 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, 29 argc, argv, base::Bind(&content::UnitTestTestSuite::Run,
34 base::Unretained(&test_suite))); 30 base::Unretained(&test_suite)));
35 } 31 }
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698