| Index: chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
|
| diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
|
| index 04a8099e4a53130cc8ae0331cc2e3542c6a305bf..9f09b4d10cb03e827da943a559cbcf78daf918c9 100644
|
| --- a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
|
| +++ b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
|
| @@ -8,7 +8,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| @@ -20,7 +19,7 @@
|
| #include "chromeos/dbus/mock_cryptohome_client.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
|
| -#include "content/public/test/test_browser_thread.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| using testing::_;
|
| @@ -80,8 +79,7 @@ class FakeDBusData {
|
|
|
| class AttestationPolicyObserverTest : public ::testing::Test {
|
| public:
|
| - AttestationPolicyObserverTest()
|
| - : ui_thread_(content::BrowserThread::UI, &message_loop_) {
|
| + AttestationPolicyObserverTest() {
|
| settings_helper_.ReplaceProvider(kDeviceAttestationEnabled);
|
| settings_helper_.SetBoolean(kDeviceAttestationEnabled, true);
|
| policy_client_.SetDMToken("fake_dm_token");
|
| @@ -156,8 +154,7 @@ class AttestationPolicyObserverTest : public ::testing::Test {
|
| return serialized;
|
| }
|
|
|
| - base::MessageLoopForUI message_loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| + content::TestBrowserThreadBundle test_browser_thread_bundle_;
|
| ScopedCrosSettingsTestHelper settings_helper_;
|
| StrictMock<MockCryptohomeClient> cryptohome_client_;
|
| StrictMock<MockAttestationFlow> attestation_flow_;
|
|
|