| Index: net/ssl/channel_id_service_unittest.cc
|
| diff --git a/net/ssl/channel_id_service_unittest.cc b/net/ssl/channel_id_service_unittest.cc
|
| index b5fc006f1b3904bd3ac2305797316384db316647..a22ec499f46ebb48294d1b75195f2816bafbe2a7 100644
|
| --- a/net/ssl/channel_id_service_unittest.cc
|
| +++ b/net/ssl/channel_id_service_unittest.cc
|
| @@ -10,8 +10,8 @@
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| #include "base/task_runner.h"
|
| +#include "base/thread_task_runner_handle.h"
|
| #include "crypto/ec_private_key.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/test_completion_callback.h"
|
| @@ -119,10 +119,8 @@ MockChannelIDStoreWithAsyncGet::CallGetChannelIDCallbackWithResult(
|
| class ChannelIDServiceTest : public testing::Test {
|
| public:
|
| ChannelIDServiceTest()
|
| - : service_(new ChannelIDService(
|
| - new DefaultChannelIDStore(NULL),
|
| - base::MessageLoopProxy::current())) {
|
| - }
|
| + : service_(new ChannelIDService(new DefaultChannelIDStore(NULL),
|
| + base::ThreadTaskRunnerHandle::Get())) {}
|
|
|
| protected:
|
| scoped_ptr<ChannelIDService> service_;
|
| @@ -586,8 +584,8 @@ TEST_F(ChannelIDServiceTest, Expiration) {
|
| TEST_F(ChannelIDServiceTest, AsyncStoreGetOrCreateNoChannelIDsInStore) {
|
| MockChannelIDStoreWithAsyncGet* mock_store =
|
| new MockChannelIDStoreWithAsyncGet();
|
| - service_ = scoped_ptr<ChannelIDService>(new ChannelIDService(
|
| - mock_store, base::MessageLoopProxy::current()));
|
| + service_ = scoped_ptr<ChannelIDService>(
|
| + new ChannelIDService(mock_store, base::ThreadTaskRunnerHandle::Get()));
|
|
|
| std::string host("encrypted.google.com");
|
|
|
| @@ -617,8 +615,8 @@ TEST_F(ChannelIDServiceTest, AsyncStoreGetOrCreateNoChannelIDsInStore) {
|
| TEST_F(ChannelIDServiceTest, AsyncStoreGetNoChannelIDsInStore) {
|
| MockChannelIDStoreWithAsyncGet* mock_store =
|
| new MockChannelIDStoreWithAsyncGet();
|
| - service_ = scoped_ptr<ChannelIDService>(new ChannelIDService(
|
| - mock_store, base::MessageLoopProxy::current()));
|
| + service_ = scoped_ptr<ChannelIDService>(
|
| + new ChannelIDService(mock_store, base::ThreadTaskRunnerHandle::Get()));
|
|
|
| std::string host("encrypted.google.com");
|
|
|
| @@ -648,8 +646,8 @@ TEST_F(ChannelIDServiceTest, AsyncStoreGetNoChannelIDsInStore) {
|
| TEST_F(ChannelIDServiceTest, AsyncStoreGetOrCreateOneCertInStore) {
|
| MockChannelIDStoreWithAsyncGet* mock_store =
|
| new MockChannelIDStoreWithAsyncGet();
|
| - service_ = scoped_ptr<ChannelIDService>(new ChannelIDService(
|
| - mock_store, base::MessageLoopProxy::current()));
|
| + service_ = scoped_ptr<ChannelIDService>(
|
| + new ChannelIDService(mock_store, base::ThreadTaskRunnerHandle::Get()));
|
|
|
| std::string host("encrypted.google.com");
|
|
|
| @@ -684,8 +682,8 @@ TEST_F(ChannelIDServiceTest, AsyncStoreGetOrCreateOneCertInStore) {
|
| TEST_F(ChannelIDServiceTest, AsyncStoreGetOneCertInStore) {
|
| MockChannelIDStoreWithAsyncGet* mock_store =
|
| new MockChannelIDStoreWithAsyncGet();
|
| - service_ = scoped_ptr<ChannelIDService>(new ChannelIDService(
|
| - mock_store, base::MessageLoopProxy::current()));
|
| + service_ = scoped_ptr<ChannelIDService>(
|
| + new ChannelIDService(mock_store, base::ThreadTaskRunnerHandle::Get()));
|
|
|
| std::string host("encrypted.google.com");
|
|
|
| @@ -719,8 +717,8 @@ TEST_F(ChannelIDServiceTest, AsyncStoreGetOneCertInStore) {
|
| TEST_F(ChannelIDServiceTest, AsyncStoreGetThenCreateNoCertsInStore) {
|
| MockChannelIDStoreWithAsyncGet* mock_store =
|
| new MockChannelIDStoreWithAsyncGet();
|
| - service_ = scoped_ptr<ChannelIDService>(new ChannelIDService(
|
| - mock_store, base::MessageLoopProxy::current()));
|
| + service_ = scoped_ptr<ChannelIDService>(
|
| + new ChannelIDService(mock_store, base::ThreadTaskRunnerHandle::Get()));
|
|
|
| std::string host("encrypted.google.com");
|
|
|
|
|