Commit 20187ac5 authored by sdefresne's avatar sdefresne Committed by Commit bot

[iOS] Fix ios_chrome_unittests on iPad

-[SnapshotCache handleLowMemory] DCHECK on iPad so do not call the method
if IsIPadIdiom() returns YES.

BUG=None

Review URL: https://codereview.chromium.org/1148873002

Cr-Commit-Position: refs/heads/master@{#330747}
parent 31af4784
......@@ -377,7 +377,8 @@ TEST_F(SnapshotCacheTest, HandleLowMemory) {
[set addObject:secondPinnedID];
cache.pinnedIDs = set;
[cache handleLowMemory];
if (!IsIPadIdiom())
[cache handleLowMemory];
BOOL expectedValue = YES;
if (IsIPadIdiom()) {
......@@ -430,7 +431,9 @@ TEST_F(SnapshotCacheTest, CreateGreyCacheFromDisk) {
// Remove color images from in-memory cache.
SnapshotCache* cache = GetSnapshotCache();
[cache handleLowMemory];
if (!IsIPadIdiom())
[cache handleLowMemory];
// Request the creation of a grey image cache for all images.
[cache createGreyCache:testSessions_];
......@@ -471,7 +474,8 @@ TEST_F(SnapshotCacheTest, MostRecentGreyBlock) {
LoadColorImagesIntoCache(kNumImages, true);
// Make sure the color images are only on disk, to ensure the background
// thread is slow enough to queue up the requests.
[cache handleLowMemory];
if (!IsIPadIdiom())
[cache handleLowMemory];
// Enable the grey image cache.
[cache createGreyCache:sessionIDs];
......@@ -542,7 +546,8 @@ TEST_F(SnapshotCacheTest, SizeAndScalePreservation) {
NSString* const kSession = @"foo";
[cache setImage:image withSessionID:kSession];
FlushRunLoops(); // ensure the file is written to disk.
[cache handleLowMemory];
if (!IsIPadIdiom())
[cache handleLowMemory];
// Retrive the image and have the callback verify the size and scale.
__block BOOL callbackComplete = NO;
......@@ -578,7 +583,8 @@ TEST_F(SnapshotCacheTest, DeleteRetinaImages) {
NSString* const kSession = @"foo";
[cache setImage:image withSessionID:kSession];
FlushRunLoops(); // ensure the file is written to disk.
[cache handleLowMemory];
if (!IsIPadIdiom())
[cache handleLowMemory];
// Verify the file was writted with @2x in the file name.
base::FilePath retinaFile = [SnapshotCache imagePathForSessionID:kSession];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment