Renamed deviceScaleFactor() to deviceScaleFactorDeprecated() in Page

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 1202 matching lines @@
   FixedLayoutTestWebViewClient client;
   client.m_screenInfo.deviceScaleFactor = 2;
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true,
                                   nullptr, &client, nullptr,
                                   enableViewportSettings);
 
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
 
-  EXPECT_EQ(2, webViewHelper.webView()->page()->deviceScaleFactor());
+  EXPECT_EQ(2, webViewHelper.webView()->page()->deviceScaleFactorDeprecated());
 
   // Device scale factor should be independent of page scale.
   webViewHelper.webView()->setDefaultPageScaleLimits(1, 2);
   webViewHelper.webView()->setPageScaleFactor(0.5);
   webViewHelper.webView()->updateAllLifecyclePhases();
   EXPECT_EQ(1, webViewHelper.webView()->pageScaleFactor());
 
   // Force the layout to happen before leaving the test.
   webViewHelper.webView()->updateAllLifecyclePhases();
 }
@@ skipping 10128 matching lines @@
   FrameTestHelpers::WebViewHelper openerHelper;
   openerHelper.initialize(false, nullptr, &openerWebViewClient);
   FrameTestHelpers::WebViewHelper helper;
   helper.initializeWithOpener(openerHelper.webView()->mainFrame());
 
   openerHelper.reset();
   EXPECT_EQ(nullptr, helper.webView()->mainFrameImpl()->opener());
 }
 
 }  // namespace blink