diff options
Diffstat (limited to 'chrome/browser/sync/notifier')
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc index 1c1e304..6aa1c96 100644 --- a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/browser/sync/util/weak_handle.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "jingle/notifier/base/fake_base_task.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/cert_verifier.h" @@ -58,7 +58,7 @@ class InvalidationNotifierTest : public testing::Test { StrictMock<MockSyncNotifierObserver> mock_observer_; notifier::FakeBaseTask fake_base_task_; // Since this test calls HostResolver code, we need an IO thread. - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; }; TEST_F(InvalidationNotifierTest, Basic) { diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc index dab0be5..be5da31 100644 --- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/browser/sync/util/weak_handle.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "jingle/notifier/base/fake_base_task.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -57,7 +57,7 @@ class NonBlockingInvalidationNotifierTest : public testing::Test { } MessageLoop ui_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<net::URLRequestContextGetter> request_context_getter_; scoped_ptr<NonBlockingInvalidationNotifier> invalidation_notifier_; StrictMock<MockSyncNotifierObserver> mock_observer_; diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.cc b/chrome/browser/sync/notifier/sync_notifier_factory.cc index 452e1f1..aa636a9 100644 --- a/chrome/browser/sync/notifier/sync_notifier_factory.cc +++ b/chrome/browser/sync/notifier/sync_notifier_factory.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sync/notifier/p2p_notifier.h" #include "chrome/browser/sync/notifier/sync_notifier.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "jingle/notifier/base/const_communicator.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/mediator_thread_impl.h" |