Revert "Cherry pick https://codereview.chromium.org/22574004/"

The patch has landed upstream and cherry pick no longer required
after next merge from master-chromium.

This reverts commit de96c6e3691f2d6e1743d739cbcfe3cc1d8b90ba.
Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: Ie5904a921ece9c5959b52c8e0b74db09fa08f144
Record Chromium merge at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I596494890e2b5f0f42401921aecac37d93d6a3e8
Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Icd67b02e5f1ff621b8d2455a6e7e4eb98aba6900
Record Chromium merge at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: I2d514925f8b409d455c0298c924f46ab3ff49084
Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: I4217737c165f68da34d720aa074431613911dc68
Record Chromium merge at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ie5069b546a15eb217e8f7261795186613e444482
Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I0d3288f5db2b121c1681ea8d4a70c964cbed1fbd
Record Chromium merge at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I74a8936bddbb662f90edbc2b70749b664979ab42
Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I085d892f6f1583a45f10eb394f195bbea5a334ef
Record Chromium merge at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: Iba00d4312bd9afb3cfac3c98dd7eaed92518a97a
Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: I6aa2623a399e683ff92335749916c23088d1fbd8
Record Chromium merge at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Id47247aff0c20efefe2e2f6eeefb0bff94c8d893
Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: I639f21f936f7475217030840a808765c32e44635
Record Chromium merge at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ia4ce78effd80cb5ae790e6b68362364f15b4878e
Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: Ifa868e6d63fe87d2338d9388aa5ea81f746d485f
Record Chromium merge at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I567f91490c287e2481e0147aaa1163870c7ba3a3
Fix frequent resetting to initialScale in non-useWideViewport mode.

The oldInitialScale was stored too late after
updatePageDefinedConstraints may have already reset it to -1.  Compare
instead against the value before any constraints processing occurred.

I incorporated this fix into pending upstream patch http://crrev.com/26251010.

BUG: b/11261382
Change-Id: If871048204be595c247e50432bb7f5988eaa8eae
Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: Iab152fc67d869deb6e9505babd8d71cab63335dd
Record Chromium merge at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I1bc4ed19a4bce5e4bddd8d75bd25d26a28d8d4a1