gfx: Make conversions from Size to SizeF be explicit.

content/browser/media/capture/web_contents_video_capture_device_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 1045 matching lines @@
           const gfx::Size& standard_size) {
     SCOPED_TRACE(::testing::Message()
                  << "policy=" << policy
                  << ", oddball_size=" << oddball_size.ToString()
                  << ", standard_size=" << standard_size.ToString());
 
     // Compute the expected preferred size.  For the fixed-resolution use case,
     // the |oddball_size| is always the expected size; whereas for the
     // variable-resolution cases, the |standard_size| is the expected size.
     // Also, adjust to account for the device scale factor.
-    gfx::Size capture_preferred_size = gfx::ToFlooredSize(gfx::ScaleSize(
-        policy == media::RESOLUTION_POLICY_FIXED_RESOLUTION ?
-            oddball_size : standard_size,
-        1.0f / GetDeviceScaleFactor()));
+    gfx::Size capture_preferred_size = gfx::ScaleToFlooredSize(
+        policy == media::RESOLUTION_POLICY_FIXED_RESOLUTION ? oddball_size
+                                                            : standard_size,
+        1.0f / GetDeviceScaleFactor());
     ASSERT_NE(capture_preferred_size, web_contents()->GetPreferredSize());
 
     // Start the WebContentsVideoCaptureDevice.
     media::VideoCaptureParams capture_params;
     capture_params.requested_format.frame_size = oddball_size;
     capture_params.requested_format.frame_rate = kTestFramesPerSecond;
     capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
     capture_params.resolution_change_policy = policy;
     StubClientObserver unused_observer;
     device()->AllocateAndStart(capture_params, unused_observer.PassClient());
@@ skipping 55 matching lines @@
         policies[i], gfx::Size(1000, 1000), gfx::Size(1000, 1000));
     RunTestForPreferredSize(
         policies[i], gfx::Size(1600, 1000), gfx::Size(1600, 1000));
     RunTestForPreferredSize(
         policies[i], gfx::Size(837, 999), gfx::Size(837, 999));
   }
 }
 
 }  // namespace
 }  // namespace content