Restore user state on ReloadwithoutSubResourceCacheRevalidation

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 3244 matching lines @@
 
     registerMockedHttpURLLoad(firstURL);
     registerMockedHttpURLLoad(secondURL);
     registerMockedHttpURLLoad(thirdURL);
 
     FrameTestHelpers::WebViewHelper webViewHelper;
     ClearScrollStateOnCommitWebFrameClient client;
     webViewHelper.initializeAndLoad(m_baseURL + firstURL, true, &client);
     webViewHelper.resize(WebSize(pageWidth, pageHeight));
     webViewHelper.webView()->mainFrame()->setScrollOffset(WebSize(pageWidth / 4, pageHeight / 4));
+    // Ensure overview mode is disabled. Otherwise scale factor may be reset on reloads.
+    webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
     webViewHelper.webView()->setPageScaleFactor(pageScaleFactor);
 
     WebSize previousOffset = webViewHelper.webView()->mainFrame()->scrollOffset();
     float previousScale = webViewHelper.webView()->pageScaleFactor();
 
     // Reload the page and end up at the same url. State should be propagated.
     webViewHelper.webView()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + firstURL), WebFrameLoadType::Reload);
     FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webView()->mainFrame());
     EXPECT_EQ(previousOffset.width, webViewHelper.webView()->mainFrame()->scrollOffset().width);
     EXPECT_EQ(previousOffset.height, webViewHelper.webView()->mainFrame()->scrollOffset().height);
@@ skipping 5642 matching lines @@
     client.addExpectedRequest(toKURL("http://internal.test/priorities/injected.js"), WebURLRequest::PriorityLow);
     client.addExpectedRequest(toKURL("http://internal.test/priorities/injected-async.js"), WebURLRequest::PriorityLow);
     client.addExpectedRequest(toKURL("http://internal.test/priorities/body.js"), WebURLRequest::PriorityHigh);
 
     FrameTestHelpers::WebViewHelper helper;
     helper.initializeAndLoad(m_baseURL + "script_priority.html", true, &client);
     client.verifyAllRequests();
 }
 
 } // namespace blink