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

Unified Diff: chrome/browser/sync/profile_sync_service_autofill_unittest.cc

Issue 6811003: [Sync] Make generic non-frontend thread datatype controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copy paste :( Created 9 years, 8 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: chrome/browser/sync/profile_sync_service_autofill_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index 889c33f2aa7d262f62541b08a2d7110241f09245..39ba1f22efbc356c0749466e877b364632af0ea6 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -207,8 +207,7 @@ class AutofillEntryFactory : public AbstractAutofillFactory {
ProfileMock* profile,
ProfileSyncService* service) {
return new AutofillDataTypeController(factory,
- profile,
- service);
+ profile);
}
void SetExpectation(ProfileSyncFactoryMock* factory,
@@ -228,8 +227,7 @@ class AutofillProfileFactory : public AbstractAutofillFactory {
ProfileMock* profile,
ProfileSyncService* service) {
return new AutofillProfileDataTypeController(factory,
- profile,
- service);
+ profile);
}
void SetExpectation(ProfileSyncFactoryMock* factory,
@@ -297,6 +295,8 @@ class ProfileSyncServiceAutofillTest : public AbstractProfileSyncServiceTest {
service_.reset(
new TestProfileSyncService(&factory_, &profile_, "test_user", false,
task));
+ EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(
+ Return(service_.get()));
AutofillDataTypeController* data_type_controller =
factory->CreateDataTypeController(&factory_,
&profile_,
@@ -665,7 +665,6 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeEntriesEmptySync) {
}
TEST_F(ProfileSyncServiceAutofillTest, HasProfileEmptySync) {
-
std::vector<AutofillProfile*> profiles;
std::vector<AutofillProfile> expected_profiles;
// Owned by GetAutofillProfiles caller.
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698