Temporarily enable scroll anchoring on trunk.

chrome/browser/ui/webui/extensions/extension_settings_browsertest.js

Index: chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
index 1aca91b8c5da4bd2ea5e2c856167b8d1cc81060e..ecf35ddeca0d0eb3517608740181f08d27c2d00f 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
@@ -323,8 +323,11 @@ TEST_F('AutoScrollExtensionSettingsWebUITest', 'testAutoScroll', function() {
     assertEquals(0, document.body.scrollTop);
     this.nextStep();
   };
-  var scrollToTop = function() {
+  var scrollToOrigin = function() {
+    // Reset both top and left to avoid a scroll anchoring adjustment when the
+    // #dev-controls element is inserted (crbug.com/646977).
     document.body.scrollTop = 0;
+    document.body.scrollLeft = 0;

[ymalik, 2016/09/14 19:54:18]

Now that we already know of the bug, should this be done in a different CL?

[skobes, 2016/09/14 19:56:59]

Yes it should... see http://crrev.com/2343683002

[ymalik, 2016/09/14 20:01:43]

Ah I see. I was confused because you have it here as well. But presumably its
because you are testing here?

     this.nextStep();
   };
   // Test that a) autoscroll works on first page load and b) updating the
@@ -332,7 +335,7 @@ TEST_F('AutoScrollExtensionSettingsWebUITest', 'testAutoScroll', function() {
   this.steps = [this.waitForPageLoad,
                 checkHasScrollbar,
                 checkIsScrolled,
-                scrollToTop,
+                scrollToOrigin,
                 this.enableDeveloperMode,
                 checkScrolledToTop,
                 testDone];