| Index: chrome/browser/policy/configuration_policy_provider_test.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_provider_test.cc b/chrome/browser/policy/configuration_policy_provider_test.cc
|
| index 64a83c01ba2ed706c1c2e2b3d43bee1f9cbd14a9..c6c9ab1edb5b45fe5913e990dd48e75b9555b129 100644
|
| --- a/chrome/browser/policy/configuration_policy_provider_test.cc
|
| +++ b/chrome/browser/policy/configuration_policy_provider_test.cc
|
| @@ -14,6 +14,7 @@
|
| #include "policy/policy_constants.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| +using content::BrowserThread;
|
| using ::testing::Mock;
|
| using ::testing::_;
|
|
|
| @@ -41,6 +42,16 @@ const PolicyDefinitionList kList = {
|
|
|
| } // namespace test_policy_definitions
|
|
|
| +PolicyTestBase::PolicyTestBase()
|
| + : ui_thread_(BrowserThread::UI, &loop_),
|
| + file_thread_(BrowserThread::FILE, &loop_) {}
|
| +
|
| +PolicyTestBase::~PolicyTestBase() {}
|
| +
|
| +void PolicyTestBase::TearDown() {
|
| + loop_.RunAllPending();
|
| +}
|
| +
|
| PolicyProviderTestHarness::PolicyProviderTestHarness(PolicyLevel level,
|
| PolicyScope scope)
|
| : level_(level), scope_(scope) {}
|
| @@ -60,7 +71,7 @@ ConfigurationPolicyProviderTest::ConfigurationPolicyProviderTest() {}
|
| ConfigurationPolicyProviderTest::~ConfigurationPolicyProviderTest() {}
|
|
|
| void ConfigurationPolicyProviderTest::SetUp() {
|
| - AsynchronousPolicyTestBase::SetUp();
|
| + PolicyTestBase::SetUp();
|
|
|
| test_harness_.reset((*GetParam())());
|
| test_harness_->SetUp();
|
| @@ -79,7 +90,7 @@ void ConfigurationPolicyProviderTest::TearDown() {
|
| // Give providers the chance to clean up after themselves on the file thread.
|
| provider_.reset();
|
|
|
| - AsynchronousPolicyTestBase::TearDown();
|
| + PolicyTestBase::TearDown();
|
| }
|
|
|
| void ConfigurationPolicyProviderTest::CheckValue(
|
|
|