| 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 "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 26 matching lines...) Expand all Loading... |
| 37 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" | 37 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" |
| 38 #endif | 38 #endif |
| 39 | 39 |
| 40 namespace content { | 40 namespace content { |
| 41 | 41 |
| 42 class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener { | 42 class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener { |
| 43 public: | 43 public: |
| 44 ContentTestSuiteBaseListener() { | 44 ContentTestSuiteBaseListener() { |
| 45 } | 45 } |
| 46 virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE { | 46 virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE { |
| 47 BrowserThreadImpl::FlushThreadPoolHelper(); | 47 BrowserThreadImpl::FlushThreadPoolHelperForTesting(); |
| 48 } | 48 } |
| 49 private: | 49 private: |
| 50 DISALLOW_COPY_AND_ASSIGN(ContentTestSuiteBaseListener); | 50 DISALLOW_COPY_AND_ASSIGN(ContentTestSuiteBaseListener); |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv) | 53 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv) |
| 54 : base::TestSuite(argc, argv) { | 54 : base::TestSuite(argc, argv) { |
| 55 } | 55 } |
| 56 | 56 |
| 57 void ContentTestSuiteBase::Initialize() { | 57 void ContentTestSuiteBase::Initialize() { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 #if !defined(OS_IOS) | 89 #if !defined(OS_IOS) |
| 90 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( | 90 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( |
| 91 CreateInProcessUtilityThread); | 91 CreateInProcessUtilityThread); |
| 92 RenderProcessHostImpl::RegisterRendererMainThreadFactory( | 92 RenderProcessHostImpl::RegisterRendererMainThreadFactory( |
| 93 CreateInProcessRendererThread); | 93 CreateInProcessRendererThread); |
| 94 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); | 94 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); |
| 95 #endif | 95 #endif |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace content | 98 } // namespace content |
| OLD | NEW |