Enables 300P support for iOS.

Enables 300P support for iOS.

The code will continue to load the 200P pak file and fall back to those
resources, but the supported scale factor on @3x devices will now be 300P.

This CL adds a unittest to ensure that image conversion works properly when the
scale factor of the source image does not match the current supported scale
factor of the system.

BUG=413300
TEST=None

Committed: https://crrev.com/6ac057568ad9411ab26784ec2bf72f9ae8cfa475
Cr-Commit-Position: refs/heads/master@{#295160}

[rohitrao (ping after 24h), 2014-09-16 14:06:04]

rohitrao@chromium.org changed reviewers:
+ lliabraa@chromium.org

[lliabraa, 2014-09-16 14:13:36]

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
File ui/base/resource/resource_bundle_ios.mm (right):

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
ui/base/resource/resource_bundle_ios.mm:61: // now, we are simply falling back
to the 200P resources.
add "crbug.com/413300"

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
ui/base/resource/resource_bundle_ios.mm:61: // now, we are simply falling back
to the 200P resources.
add "crbug.com/413300"

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
ui/base/resource/resource_bundle_ios.mm:62: if
(IsScaleFactorSupported(SCALE_FACTOR_200P)) {
this should be 300P, right?

https://codereview.chromium.org/574663003/diff/20001/ui/gfx/image/image_ios_u...
File ui/gfx/image/image_ios_unittest.mm (right):

https://codereview.chromium.org/574663003/diff/20001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:53: // the list of supported scale factors..
drop extra period

[rohitrao (ping after 24h), 2014-09-16 14:16:48]

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
File ui/base/resource/resource_bundle_ios.mm (right):

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
ui/base/resource/resource_bundle_ios.mm:61: // now, we are simply falling back
to the 200P resources.
On 2014/09/16 14:13:36, lliabraa wrote:
> add "crbug.com/413300"

Done.

https://codereview.chromium.org/574663003/diff/20001/ui/base/resource/resourc...
ui/base/resource/resource_bundle_ios.mm:62: if
(IsScaleFactorSupported(SCALE_FACTOR_200P)) {
On 2014/09/16 14:13:36, lliabraa wrote:
> this should be 300P, right?

Yup, bad copy/paste.  Good catch!

https://codereview.chromium.org/574663003/diff/20001/ui/gfx/image/image_ios_u...
File ui/gfx/image/image_ios_unittest.mm (right):

https://codereview.chromium.org/574663003/diff/20001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:53: // the list of supported scale factors..
On 2014/09/16 14:13:36, lliabraa wrote:
> drop extra period

Done.

[lliabraa, 2014-09-16 14:39:31]

lgtm

[rohitrao (ping after 24h), 2014-09-16 14:44:16]

rohitrao@chromium.org changed reviewers:
+ rsesek@chromium.org, tony@chromium.org

[rohitrao (ping after 24h), 2014-09-16 14:44:17]

+Tony for ui/base/resource OWNERS
+Robert for ui/gfx OWNERS


For some background: we are working on getting 300P assets, but until those
exist, I believe we can simply convince the ResourceBundle code to load 200P
assets instead.  (The 300P asset change will also likely be too large for M38,
whereas this change seems simple enough that I would be comfortable merging it.)

Our original plan was to leave the supported scale factor as 200P for these new
devices, but the more I thought about that, the more worried I because about the
mismatch between the support scale factor (200P) and [[UIScreen mainScreen]
scale] (@3x).  It seems substantially safer to keep those two in agreement.

[Robert Sesek, 2014-09-16 15:51:30]

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
File ui/gfx/image/image_ios_unittest.mm (right):

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:20: base::ScopedCFTypeRef<CGColorSpaceRef>
color_space(
Could you use CreateImage() here (in image_unittest_util.h)?

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:43: class ImageIOSTest : public testing::Test
{
You could delete this class and just use TEST(ImageIOSTest,
ImageConversionWithUnsupportedScaleFactor).

[tony, 2014-09-16 16:46:39]

LGTM with rsesek's changes addressed.

[rohitrao (ping after 24h), 2014-09-16 17:20:52]

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
File ui/gfx/image/image_ios_unittest.mm (right):

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:20: base::ScopedCFTypeRef<CGColorSpaceRef>
color_space(
On 2014/09/16 15:51:30, rsesek wrote:
> Could you use CreateImage() here (in image_unittest_util.h)?

I'm intentionally creating a UIImage from scratch here, so that I know exactly
what size UIImage I'm starting with.  All of the test utils, including
CreateImage(), create an SkBitmap first and then convert to what's asked for. 
I'll add a comment.

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:43: class ImageIOSTest : public testing::Test
{
On 2014/09/16 15:51:30, rsesek wrote:
> You could delete this class and just use TEST(ImageIOSTest,
> ImageConversionWithUnsupportedScaleFactor).

Done.  I'll bring the fixture back when I need it.

Do I need to save/restore the original set of SupportedScaleFactors?  I'm not
sure any other tests bother.

[Robert Sesek, 2014-09-16 17:26:16]

LGTM

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
File ui/gfx/image/image_ios_unittest.mm (right):

https://codereview.chromium.org/574663003/diff/40001/ui/gfx/image/image_ios_u...
ui/gfx/image/image_ios_unittest.mm:43: class ImageIOSTest : public testing::Test
{
On 2014/09/16 17:20:52, rohitrao wrote:
> On 2014/09/16 15:51:30, rsesek wrote:
> > You could delete this class and just use TEST(ImageIOSTest,
> > ImageConversionWithUnsupportedScaleFactor).
> 
> Done.  I'll bring the fixture back when I need it.
> 
> Do I need to save/restore the original set of SupportedScaleFactors?  I'm not
> sure any other tests bother.

It might be a good idea to do that.

[rohitrao (ping after 24h), 2014-09-16 18:17:33]

> > Do I need to save/restore the original set of SupportedScaleFactors?  I'm
not
> > sure any other tests bother.
> 
> It might be a good idea to do that.

Done.

[rohitrao (ping after 24h), 2014-09-16 18:47:40]

The CQ bit was checked by rohitrao@chromium.org

[commit-bot: I haz the power, 2014-09-16 18:49:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/574663003/100001

[commit-bot: I haz the power, 2014-09-16 22:26:54]

Committed patchset #6 (id:100001) as 4d9f7c295531ab4a9b8bdc8445a412c70e90e0db

[commit-bot: I haz the power, 2014-09-16 22:27:36]

Patchset 6 (id:??) landed as
https://crrev.com/6ac057568ad9411ab26784ec2bf72f9ae8cfa475
Cr-Commit-Position: refs/heads/master@{#295160}