diff options
| author | haitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 23:45:52 +0000 |
|---|---|---|
| committer | haitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 23:45:52 +0000 |
| commit | a4427ceca7f979189515c0b9c64f4869bb91e64e (patch) | |
| tree | 67735c7153f51c7c8146213bdcca8f19857f603d | |
| parent | 5fb421ebdc9736bfeedb0d9a691ef2f0d47c0a3b (diff) | |
| download | chromium_src-a4427ceca7f979189515c0b9c64f4869bb91e64e.zip chromium_src-a4427ceca7f979189515c0b9c64f4869bb91e64e.tar.gz chromium_src-a4427ceca7f979189515c0b9c64f4869bb91e64e.tar.bz2 | |
Merge 280149 "Shouldn't call InitialSyncEndedTypes() when sync D..."
> Shouldn't call InitialSyncEndedTypes() when sync DB failed to load. That would cause crash.
>
> BUG=388948
>
> Review URL: https://codereview.chromium.org/345233005
TBR=haitaol@chromium.org
Review URL: https://codereview.chromium.org/420003002
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@285726 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | sync/internal_api/sync_rollback_manager_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc index 46e40d3..338f5af 100644 --- a/sync/internal_api/sync_rollback_manager_base.cc +++ b/sync/internal_api/sync_rollback_manager_base.cc @@ -215,7 +215,7 @@ void SyncRollbackManagerBase::NotifyInitializationFailure() { OnInitializationComplete( MakeWeakHandle(base::WeakPtr<JsBackend>()), MakeWeakHandle(base::WeakPtr<DataTypeDebugInfoListener>()), - false, InitialSyncEndedTypes())); + false, ModelTypeSet())); } std::string SyncRollbackManagerBase::GetOwnerName() const { |