| Index: chrome/browser/sync/internal_api/syncapi_unittest.cc
|
| diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc
|
| index fd993c24485d398204aa83e5d865e3b16805b94d..3268109091b68ffad4b855414e2642d5972d849d 100644
|
| --- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
|
| +++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
|
| @@ -23,8 +23,8 @@
|
| #include "chrome/browser/password_manager/encryptor.h"
|
| #include "chrome/browser/sync/engine/model_safe_worker.h"
|
| #include "chrome/browser/sync/engine/nigori_util.h"
|
| -#include "chrome/browser/sync/internal_api/change_record.h"
|
| #include "chrome/browser/sync/engine/syncapi_internal.h"
|
| +#include "chrome/browser/sync/internal_api/change_record.h"
|
| #include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
|
| #include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
|
| #include "chrome/browser/sync/internal_api/read_node.h"
|
| @@ -52,7 +52,7 @@
|
| #include "chrome/browser/sync/util/cryptographer.h"
|
| #include "chrome/browser/sync/util/time.h"
|
| #include "chrome/test/base/values_test_util.h"
|
| -#include "content/browser/browser_thread.h"
|
| +#include "content/test/test_browser_thread.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -824,7 +824,7 @@ class SyncManagerTest : public testing::Test,
|
| // Needed by |ui_thread_|.
|
| MessageLoopForUI ui_loop_;
|
| // Needed by |sync_manager_|.
|
| - BrowserThread ui_thread_;
|
| + content::TestBrowserThread ui_thread_;
|
| // Needed by |sync_manager_|.
|
| ScopedTempDir temp_dir_;
|
| // Sync Id's for the roots of the enabled datatypes.
|
|
|