| commit | deac4290c3fd825f6f3000e89d67d4ac8a190371 | [log] [tgz] |
|---|---|---|
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Sep 03 23:05:56 2011 |
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Sep 03 23:05:56 2011 |
| tree | 79a5bfbd68b556580a6460e3c6e213f8bbe72e5b | |
| parent | 2c7cb0856cad71ed31f03814f4dddc9093c67403 [diff] |
Retroactively addressed sky@'s comments from CL http://codereview.chromium.org/7566036/. Added a unit test along side TemplateURLService's SyncableService changes. BUG=15548 TEST=Ensure new test (TemplateURLServiceSyncTest.MergeTwiceWithSameSyncData) passes. Review URL: http://codereview.chromium.org/7826003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99578 0039d316-1c4b-4281-b951-d872f2087c98