android: Use Display in thumbnail_cache

chrome/browser/android/thumbnail/thumbnail_cache.cc

 // Copyright 2014 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 "chrome/browser/android/thumbnail/thumbnail_cache.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 10 matching lines @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/android_opengl/etc1/etc1.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "ui/android/resources/ui_resource_provider.h"
-#include "ui/gfx/android/device_display_info.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace {
 
 const float kApproximationScaleFactor = 4.f;
 const base::TimeDelta kCaptureMinRequestTimeMs(
     base::TimeDelta::FromMilliseconds(1000));
 
 const int kCompressedKey = 0xABABABAB;
 const int kCurrentExtraVersion = 1;
@@ skipping 645 matching lines @@
     return false;
 
   int raw_height = 0;
   raw_height = etc1_pkm_get_height(etc1_buffer);
   if (raw_height <= 0)
     return false;
 
   // Do some simple sanity check validation.  We can't have thumbnails larger
   // than the max display size of the screen.  We also can't have etc1 texture
   // data larger than the next power of 2 up from that.
-  gfx::DeviceDisplayInfo display_info;
-  int max_dimension = std::max(display_info.GetDisplayWidth(),
-                               display_info.GetDisplayHeight());
+  gfx::Size display_size =
+      display::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
+  int max_dimension = std::max(display_size.width(), display_size.height());
 
   if (content_width > max_dimension
       || content_height > max_dimension
       || static_cast<size_t>(raw_width) > NextPowerOfTwo(max_dimension)
       || static_cast<size_t>(raw_height) > NextPowerOfTwo(max_dimension)) {
     return false;
   }
 
   int data_size = etc1_get_encoded_data_size(raw_width, raw_height);
   sk_sp<SkData> etc1_pixel_data(SkData::MakeUninitialized(data_size));
@@ skipping 224 matching lines @@
   return std::make_pair(dst_bitmap, new_scale * scale);
 }
 
 void ThumbnailCache::OnMemoryPressure(
     base::MemoryPressureListener::MemoryPressureLevel level) {
   if (level == base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL) {
     cache_.Clear();
     approximation_cache_.Clear();
   }
 }