[Sync] Make ModelTypeController::DeactivateDataType idempotent

[Sync] Make ModelTypeController::DeactivateDataType idempotent

The issue is that ModelAssociationManager::StopDatatype() always calls
DeactivateDataType before Stop. It causes DCHECK if type wasn't previously
activated.

DirectoryDataTypeController::Deactivate is already idempotent, this change is to
mirror this behavior for USS type.

Proper fix is to update controller's state during activation and not call
Deactivate when not needed, but this change is more involved.

BUG=658443
R=maxbogue@chromium.org

Committed: https://crrev.com/9a4c395dd213a7ecbf0213924c213403aefc6a31
Cr-Commit-Position: refs/heads/master@{#429487}

[pavely, 2016-11-02 22:55:05]

The CQ bit was checked by pavely@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-11-02 22:55:40]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[maxbogue, 2016-11-02 23:06:36]

lgtm

[commit-bot: I haz the power, 2016-11-02 23:54:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-02 23:54:07]

Dry run: Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[pavely, 2016-11-03 00:03:19]

The CQ bit was checked by pavely@chromium.org

[commit-bot: I haz the power, 2016-11-03 00:04:16]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-03 00:58:41]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-11-03 01:00:38]

Description was changed from

==========
[Sync] Make ModelTypeController::DeactivateDataType idempotent

The issue is that ModelAssociationManager::StopDatatype() always calls
DeactivateDataType before Stop. It causes DCHECK if type wasn't previously
activated.

DirectoryDataTypeController::Deactivate is already idempotent, this change is to
mirror this behavior for USS type.

Proper fix is to update controller's state during activation and not call
Deactivate when not needed, but this change is more involved.

BUG=658443
R=maxbogue@chromium.org
==========

to

==========
[Sync] Make ModelTypeController::DeactivateDataType idempotent

The issue is that ModelAssociationManager::StopDatatype() always calls
DeactivateDataType before Stop. It causes DCHECK if type wasn't previously
activated.

DirectoryDataTypeController::Deactivate is already idempotent, this change is to
mirror this behavior for USS type.

Proper fix is to update controller's state during activation and not call
Deactivate when not needed, but this change is more involved.

BUG=658443
R=maxbogue@chromium.org

Committed: https://crrev.com/9a4c395dd213a7ecbf0213924c213403aefc6a31
Cr-Commit-Position: refs/heads/master@{#429487}
==========

[commit-bot: I haz the power, 2016-11-03 01:00:39]

Patchset 1 (id:??) landed as
https://crrev.com/9a4c395dd213a7ecbf0213924c213403aefc6a31
Cr-Commit-Position: refs/heads/master@{#429487}