Stops using ConvertRectToPixel in snapshot_aura.

ui/snapshot/snapshot_aura_unittest.cc

 // Copyright (c) 2013 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 "base/test/test_simple_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_helper.h"
@@ skipping 108 matching lines @@
   }
 
   void SetupTestWindow(const gfx::Rect& window_bounds) {
     delegate_.reset(new TestPaintingWindowDelegate(window_bounds.size()));
     test_window_.reset(aura::test::CreateTestWindowWithDelegate(
         delegate_.get(), 0, window_bounds, root_window()));
   }
 
   gfx::Image GrabSnapshotForTestWindow() {
     gfx::Rect source_rect(test_window_->bounds().size());
+    aura::Window::ConvertRectToTarget(
+        test_window(), root_window(), &source_rect);
 
     scoped_refptr<base::TestSimpleTaskRunner> task_runner(
         new base::TestSimpleTaskRunner());
     scoped_refptr<SnapshotHolder> holder(new SnapshotHolder);
     ui::GrabWindowSnapshotAsync(
-        test_window(),
+        root_window(),
         source_rect,
         task_runner,
         base::Bind(&SnapshotHolder::SnapshotCallback, holder));
 
     // Wait for copy response.
     WaitForDraw();
     // Run internal snapshot callback to scale/rotate response image.
     task_runner->RunUntilIdle();
     // Run SnapshotHolder callback.
     helper_->RunAllPendingInMessageLoop();
@@ skipping 137 matching lines @@
   gfx::SizeF snapshot_size(test_bounds.size());
   snapshot_size.Scale(2.0f);
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
   EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
             snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCountWithScaleFactor(snapshot, 2));
 }
 
 }  // namespace ui