Reland Change minimum length of Aura overlay scrollbars.

third_party/WebKit/Source/web/tests/FrameTestHelpers.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 108 matching lines @@
  public:
   UseMockScrollbarSettings()
       : m_originalMockScrollbarEnabled(Settings::mockScrollbarsEnabled()),
         m_originalOverlayScrollbarsEnabled(
             RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
     Settings::setMockScrollbarsEnabled(true);
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
     EXPECT_TRUE(ScrollbarTheme::theme().usesOverlayScrollbars());
   }
 
+  UseMockScrollbarSettings(bool useMock, bool useOverlay)
+      : m_originalMockScrollbarEnabled(Settings::mockScrollbarsEnabled()),
+        m_originalOverlayScrollbarsEnabled(
+            RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
+    Settings::setMockScrollbarsEnabled(useMock);
+    RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(useOverlay);
+    EXPECT_EQ(useOverlay, ScrollbarTheme::theme().usesOverlayScrollbars());
+  }
+
   ~UseMockScrollbarSettings() {
     Settings::setMockScrollbarsEnabled(m_originalMockScrollbarEnabled);
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(
         m_originalOverlayScrollbarsEnabled);
   }
 
  private:
   bool m_originalMockScrollbarEnabled;
   bool m_originalOverlayScrollbarsEnabled;
 };
@@ skipping 138 matching lines @@
                           WebDOMMessageEvent) override {}
 
  private:
   Persistent<WebRemoteFrameImpl> const m_frame;
 };
 
 }  // namespace FrameTestHelpers
 }  // namespace blink
 
 #endif  // FrameTestHelpers_h