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

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

Issue 2002012: sync: Add location info to unrecoverable error. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add error handler back to bookmark model associator Created 10 years, 6 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_preference_unittest.cc
===================================================================
--- chrome/browser/sync/profile_sync_service_preference_unittest.cc (revision 48898)
+++ chrome/browser/sync/profile_sync_service_preference_unittest.cc (working copy)
@@ -29,6 +29,19 @@
using testing::_;
using testing::Return;
+class TestPreferenceModelAssociator : public PreferenceModelAssociator {
+ public:
+ TestPreferenceModelAssociator(ProfileSyncService* service)
+ : PreferenceModelAssociator(service),
+ helper_(new TestModelAssociatorHelper()) {
+ }
+ virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id) {
+ return helper_->GetSyncIdForTaggedNode(this, tag, sync_id);
+ }
+ private:
+ scoped_ptr<TestModelAssociatorHelper> helper_;
+};
+
class ProfileSyncServicePreferenceTest : public testing::Test {
protected:
ProfileSyncServicePreferenceTest()
@@ -54,9 +67,7 @@
true));
// Register the preference data type.
- model_associator_ =
- new TestModelAssociator<PreferenceModelAssociator>(service_.get(),
- service_.get());
+ model_associator_ = new TestPreferenceModelAssociator(service_.get());
change_processor_ = new PreferenceChangeProcessor(model_associator_,
service_.get());
EXPECT_CALL(factory_, CreatePreferenceSyncComponents(_, _)).

Powered by Google App Engine
This is Rietveld 408576698