Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <string>
 
 #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"
 #include "chrome/browser/chromeos/attestation/attestation_key_payload.pb.h"
 #include "chrome/browser/chromeos/attestation/attestation_policy_observer.h"
 #include "chrome/browser/chromeos/attestation/fake_certificate.h"
 #include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
 #include "chromeos/attestation/mock_attestation_flow.h"
 #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::_;
 using testing::Invoke;
 using testing::StrictMock;
 using testing::WithArgs;
 
 namespace chromeos {
 namespace attestation {
 
@@ skipping 39 matching lines @@
   }
 
  private:
   std::string data_;
 };
 
 }  // namespace
 
 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");
   }
 
  protected:
   enum MockOptions {
     MOCK_KEY_EXISTS = 1,          // Configure so a certified key exists.
     MOCK_KEY_UPLOADED = (1 << 1), // Configure so an upload has occurred.
     MOCK_NEW_KEY = (1 << 2)       // Configure expecting new key generation.
@@ skipping 54 matching lines @@
   }
 
   std::string CreatePayload() {
     AttestationKeyPayload proto;
     proto.set_is_certificate_uploaded(true);
     std::string serialized;
     proto.SerializeToString(&serialized);
     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_;
   StrictMock<policy::MockCloudPolicyClient> policy_client_;
 };
 
 TEST_F(AttestationPolicyObserverTest, FeatureDisabled) {
   settings_helper_.SetBoolean(kDeviceAttestationEnabled, false);
   Run();
 }
@@ skipping 49 matching lines @@
   SetupMocks(MOCK_NEW_KEY, "");
   // Simulate a DBus failure.
   EXPECT_CALL(cryptohome_client_, TpmAttestationDoesKeyExist(_, _, _, _))
       .WillOnce(WithArgs<3>(Invoke(DBusCallbackError)))
       .WillRepeatedly(WithArgs<3>(Invoke(DBusCallbackFalse)));
   Run();
 }
 
 }  // namespace attestation
 }  // namespace chromeos