| Index: chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc
|
| diff --git a/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc b/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc
|
| index 14db01e80ae615554f28f74b85417764f1f219a0..161e082abe0688bbf9e7a35c9977ecf569f5b635 100644
|
| --- a/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc
|
| +++ b/chrome/browser/printing/cloud_print/gcd_api_flow_unittest.cc
|
| @@ -8,11 +8,10 @@
|
| #include <utility>
|
|
|
| #include "base/bind.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/printing/cloud_print/gcd_api_flow_impl.h"
|
| -#include "content/public/test/test_browser_thread.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "google_apis/gaia/fake_oauth2_token_service.h"
|
| #include "google_apis/gaia/google_service_auth_error.h"
|
| #include "net/base/host_port_pair.h"
|
| @@ -48,8 +47,7 @@ class MockDelegate : public CloudPrintApiFlowRequest {
|
| class GCDApiFlowTest : public testing::Test {
|
| public:
|
| GCDApiFlowTest()
|
| - : ui_thread_(content::BrowserThread::UI, &loop_),
|
| - request_context_(new net::TestURLRequestContextGetter(
|
| + : request_context_(new net::TestURLRequestContextGetter(
|
| base::ThreadTaskRunnerHandle::Get())),
|
| account_id_(kAccountId) {}
|
|
|
| @@ -60,7 +58,6 @@ class GCDApiFlowTest : public testing::Test {
|
| token_service_.GetFakeOAuth2TokenServiceDelegate()->set_request_context(
|
| request_context_.get());
|
| token_service_.AddAccount(account_id_);
|
| - ui_thread_.Stop(); // HACK: Fake being on the UI thread
|
|
|
| std::unique_ptr<MockDelegate> delegate = base::MakeUnique<MockDelegate>();
|
| mock_delegate_ = delegate.get();
|
| @@ -72,8 +69,7 @@ class GCDApiFlowTest : public testing::Test {
|
| gcd_flow_->Start(std::move(delegate));
|
| }
|
|
|
| - base::MessageLoopForUI loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| + content::TestBrowserThreadBundle test_browser_thread_bundle_;
|
| scoped_refptr<net::TestURLRequestContextGetter> request_context_;
|
| net::TestURLFetcherFactory fetcher_factory_;
|
| FakeOAuth2TokenService token_service_;
|
|
|