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

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

Issue 11649032: Flush SequenceWorkerPool tasks after each unit test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/browser_thread_impl.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 "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/test/test_suite.h" 10 #include "base/test/test_suite.h"
11 #include "base/threading/sequenced_worker_pool.h"
12 #include "content/browser/browser_thread_impl.h"
11 #include "content/common/url_schemes.h" 13 #include "content/common/url_schemes.h"
12 #include "content/public/common/content_client.h" 14 #include "content/public/common/content_client.h"
13 #include "content/public/common/content_paths.h" 15 #include "content/public/common/content_paths.h"
14 #include "media/base/media.h" 16 #include "media/base/media.h"
17 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/ui_base_paths.h" 18 #include "ui/base/ui_base_paths.h"
16 #include "ui/compositor/compositor_setup.h" 19 #include "ui/compositor/compositor_setup.h"
17 20
18 #if defined(OS_ANDROID) 21 #if defined(OS_ANDROID)
19 #include "base/android/jni_android.h" 22 #include "base/android/jni_android.h"
20 #include "content/browser/android/browser_jni_registrar.h" 23 #include "content/browser/android/browser_jni_registrar.h"
21 #include "content/common/android/common_jni_registrar.h" 24 #include "content/common/android/common_jni_registrar.h"
22 #include "net/android/net_jni_registrar.h" 25 #include "net/android/net_jni_registrar.h"
23 #include "ui/android/ui_jni_registrar.h" 26 #include "ui/android/ui_jni_registrar.h"
24 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 27 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
25 #endif 28 #endif
26 29
27 namespace content { 30 namespace content {
28 31
32 class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener {
33 public:
34 ContentTestSuiteBaseListener() {
35 }
36 virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
37 BrowserThreadImpl::FlushThreadPoolHelper();
38 }
39 private:
40 DISALLOW_COPY_AND_ASSIGN(ContentTestSuiteBaseListener);
41 };
42
29 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv) 43 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv)
30 : base::TestSuite(argc, argv), 44 : base::TestSuite(argc, argv),
31 external_libraries_enabled_(true) { 45 external_libraries_enabled_(true) {
32 } 46 }
33 47
34 void ContentTestSuiteBase::Initialize() { 48 void ContentTestSuiteBase::Initialize() {
35 base::TestSuite::Initialize(); 49 base::TestSuite::Initialize();
36 50
37 #if defined(OS_ANDROID) 51 #if defined(OS_ANDROID)
38 // Register JNI bindings for android. 52 // Register JNI bindings for android.
(...skipping 11 matching lines...) Expand all
50 scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization()); 64 scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
51 SetContentClient(client_for_init.get()); 65 SetContentClient(client_for_init.get());
52 RegisterContentSchemes(false); 66 RegisterContentSchemes(false);
53 SetContentClient(NULL); 67 SetContentClient(NULL);
54 68
55 RegisterPathProvider(); 69 RegisterPathProvider();
56 ui::RegisterPathProvider(); 70 ui::RegisterPathProvider();
57 71
58 // Mock out the compositor on platforms that use it. 72 // Mock out the compositor on platforms that use it.
59 ui::SetupTestCompositor(); 73 ui::SetupTestCompositor();
74
75 testing::UnitTest::GetInstance()->listeners().Append(
76 new ContentTestSuiteBaseListener);
60 } 77 }
61 78
62 } // namespace content 79 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698