Fix set_area sizes for RequestCopyOfOutput, and related tests.

ui/snapshot/snapshot_android.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 "ui/snapshot/snapshot.h"
 
 #include "base/bind.h"
 #include "cc/output/copy_output_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/android/view_android.h"
 #include "ui/base/android/window_android.h"
 #include "ui/base/android/window_android_compositor.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
-#include "ui/gfx/geometry/rect_conversions.h"
-#include "ui/gfx/screen.h"
 #include "ui/snapshot/snapshot_async.h"
 
 namespace ui {
 
 bool GrabViewSnapshot(gfx::NativeView view,
                       std::vector<unsigned char>* png_representation,
                       const gfx::Rect& snapshot_bounds) {
   return GrabWindowSnapshot(
       view->GetWindowAndroid(), png_representation, snapshot_bounds);
 }
 
 bool GrabWindowSnapshot(gfx::NativeWindow window,
                         std::vector<unsigned char>* png_representation,
                         const gfx::Rect& snapshot_bounds) {
   // Not supported in Android.  Callers should fall back to the async version.
   return false;
 }
 
 static void MakeAsyncCopyRequest(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const cc::CopyOutputRequest::CopyOutputRequestCallback& callback) {
   scoped_ptr<cc::CopyOutputRequest> request =
       cc::CopyOutputRequest::CreateBitmapRequest(callback);
 
-  const gfx::Display& display =
-      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
-  float device_scale_factor = display.device_scale_factor();
-  gfx::Rect source_rect_in_pixel =
-      gfx::ToEnclosingRect(gfx::ScaleRect(source_rect, device_scale_factor));
-
   // Account for the toolbar offset.
   gfx::Vector2dF offset = window->content_offset();
-  gfx::Rect adjusted_source_rect(gfx::ToRoundedPoint(
-      gfx::PointF(source_rect_in_pixel.x() + offset.x(),
-                  source_rect_in_pixel.y() + offset.y())),
-      source_rect_in_pixel.size());
+  gfx::Rect adjusted_source_rect(
+      gfx::ToRoundedPoint(gfx::PointF(source_rect.x() + offset.x(),
+                                      source_rect.y() + offset.y())),
+      source_rect.size());
 
   request->set_area(adjusted_source_rect);
   window->GetCompositor()->RequestCopyOfOutputOnRootLayer(request.Pass());
 }
 
 void GrabWindowSnapshotAndScaleAsync(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const gfx::Size& target_size,
     scoped_refptr<base::TaskRunner> background_task_runner,
@@ skipping 21 matching lines @@
 void GrabViewSnapshotAsync(
     gfx::NativeView view,
     const gfx::Rect& source_rect,
     scoped_refptr<base::TaskRunner> background_task_runner,
     const GrabWindowSnapshotAsyncPNGCallback& callback) {
   GrabWindowSnapshotAsync(
       view->GetWindowAndroid(), source_rect, background_task_runner, callback);
 }
 
 }  // namespace ui