diff options
| author | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 23:40:09 +0000 |
|---|---|---|
| committer | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 23:40:09 +0000 |
| commit | 8e064aff685d0c7ac7a1f84acf7e04a81e0d2e08 (patch) | |
| tree | 6dd7bc806e703598cb04c0bcf3d7db0627674f65 /chrome/browser/themes/theme_syncable_service_unittest.cc | |
| parent | d7ea0c8cc1be6a230c43f478abd249c7b594e328 (diff) | |
| download | chromium_src-8e064aff685d0c7ac7a1f84acf7e04a81e0d2e08.zip chromium_src-8e064aff685d0c7ac7a1f84acf7e04a81e0d2e08.tar.gz chromium_src-8e064aff685d0c7ac7a1f84acf7e04a81e0d2e08.tar.bz2 | |
Replace deprecated 3-arg SyncData::CreateLocalData with 5-arg version.
Update unit tests that call SyncData::CreateLocalData to call the new
version.
Add AttachmentServiceProxyForTest to reduce boilerplate in tests.
Add a MessageLoop to ManagedUserSyncServiceTest, DomDistillerStoreTest,
and SyncChangeTest because AttachmentServiceProxyForTest needs one.
Format modified lines with clang-format.
TBR=pam,droger,asargent,pkasting,pkotwicz,cjhopman
BUG=353296
Review URL: https://codereview.chromium.org/213003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes/theme_syncable_service_unittest.cc')
| -rw-r--r-- | chrome/browser/themes/theme_syncable_service_unittest.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index 9ab0175..254bd5b 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -22,6 +22,8 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_set.h" +#include "sync/api/attachments/attachment_id.h" +#include "sync/api/attachments/attachment_service_proxy_for_test.h" #include "sync/api/fake_sync_change_processor.h" #include "sync/api/sync_change_processor_wrapper_for_test.h" #include "sync/api/sync_error.h" @@ -451,11 +453,15 @@ TEST_F(ThemeSyncableServiceTest, ProcessSyncThemeChange) { sync_pb::EntitySpecifics entity_specifics; entity_specifics.mutable_theme()->CopyFrom(theme_specifics); syncer::SyncChangeList change_list; - change_list.push_back(syncer::SyncChange( - FROM_HERE, - syncer::SyncChange::ACTION_UPDATE, - syncer::SyncData::CreateRemoteData( - 1, entity_specifics, base::Time()))); + change_list.push_back( + syncer::SyncChange(FROM_HERE, + syncer::SyncChange::ACTION_UPDATE, + syncer::SyncData::CreateRemoteData( + 1, + entity_specifics, + base::Time(), + syncer::AttachmentIdList(), + syncer::AttachmentServiceProxyForTest::Create()))); error = theme_sync_service_->ProcessSyncChanges(FROM_HERE, change_list); EXPECT_FALSE(error.IsSet()) << error.message(); EXPECT_EQ(fake_theme_service_->theme_extension(), theme_extension_.get()); |