Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: components/sync_driver/device_info_sync_service_unittest.cc

Issue 612103005: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync_driver/device_info_sync_service_unittest.cc
diff --git a/chrome/browser/sync/glue/device_info_sync_service_unittest.cc b/components/sync_driver/device_info_sync_service_unittest.cc
similarity index 98%
rename from chrome/browser/sync/glue/device_info_sync_service_unittest.cc
rename to components/sync_driver/device_info_sync_service_unittest.cc
index 5d66a8182425a2dd0e5e024a187b6b93c70eb9fc..c1200d76167551d5a6cff44e5f62d9acd9818321 100644
--- a/chrome/browser/sync/glue/device_info_sync_service_unittest.cc
+++ b/components/sync_driver/device_info_sync_service_unittest.cc
@@ -3,9 +3,8 @@
// found in the LICENSE file.
#include "base/message_loop/message_loop.h"
-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
#include "components/sync_driver/device_info_sync_service.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "components/sync_driver/local_device_info_provider_mock.h"
#include "sync/api/sync_change.h"
#include "sync/api/sync_change_processor.h"
#include "sync/api/sync_change_processor_wrapper_for_test.h"
@@ -14,8 +13,6 @@
#include "sync/util/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-using sync_driver::DeviceInfoSyncService;
-using sync_driver::DeviceInfoTracker;
using syncer::AttachmentIdList;
using syncer::AttachmentServiceProxyForTest;
using syncer::ModelType;
@@ -30,7 +27,7 @@ using syncer::SyncErrorFactory;
using syncer::SyncErrorFactoryMock;
using syncer::SyncMergeResult;
-namespace browser_sync {
+namespace sync_driver {
namespace {
@@ -159,7 +156,7 @@ class DeviceInfoSyncServiceTest : public testing::Test,
scoped_ptr<LocalDeviceInfoProviderMock> local_device_;
scoped_ptr<DeviceInfoSyncService> sync_service_;
scoped_ptr<TestChangeProcessor> sync_processor_;
- content::TestBrowserThreadBundle thread_bundle_;
+ base::MessageLoopForUI message_loop_;
};
// Sync with empty initial data.
@@ -556,4 +553,4 @@ TEST_F(DeviceInfoSyncServiceTest,
} // namespace
-} // namespace browser_sync
+} // namespace sync_driver

Powered by Google App Engine
This is Rietveld 408576698