Merge 173933

ui/aura/window_unittest.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/aura/window.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 357 matching lines @@
 // Test Window::ConvertPointToWindow() with transform to root_window.
 TEST_F(WindowTest, MoveCursorToWithTransformRootWindow) {
   RootWindow* root = root_window();
   gfx::Transform transform;
   transform.Translate(100.0, 100.0);
   transform.Rotate(90.0);
   transform.Scale(2.0, 5.0);
   root->SetTransform(transform);
   root->MoveCursorTo(gfx::Point(10, 10));
 #if !defined(OS_WIN)
+  gfx::Point mouse_location;
+  EXPECT_TRUE(root->QueryMouseLocationForTest(&mouse_location));
   // TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.OD
-  EXPECT_EQ("50,120", root->QueryMouseLocationForTest().ToString());
+  EXPECT_EQ("50,120", mouse_location.ToString());
 #endif
   EXPECT_EQ("10,10",
       gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());
 }
 
 // Tests Window::ConvertPointToWindow() with transform to non-root windows.
 TEST_F(WindowTest, MoveCursorToWithTransformWindow) {
   scoped_ptr<Window> w1(
       CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 10, 500, 500),
                        root_window()));
@@ skipping 59 matching lines @@
   root->SetTransform(root_transform);
   w1->SetTransform(transform);
   w11->SetTransform(transform);
   w111->SetTransform(transform);
   w1111->SetTransform(transform);
 
   w1111->MoveCursorTo(gfx::Point(10, 10));
 
 #if !defined(OS_WIN)
   // TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.
-  EXPECT_EQ("169,80", root->QueryMouseLocationForTest().ToString());
+  gfx::Point mouse_location;
+  EXPECT_TRUE(root->QueryMouseLocationForTest(&mouse_location));
+  EXPECT_EQ("169,80", mouse_location.ToString());
 #endif
   EXPECT_EQ("20,53",
       gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());
 }
 
 TEST_F(WindowTest, HitTest) {
   Window w1(new ColorTestWindowDelegate(SK_ColorWHITE));
   w1.set_id(1);
   w1.Init(ui::LAYER_TEXTURED);
   w1.SetBounds(gfx::Rect(10, 20, 50, 60));
@@ skipping 2120 matching lines @@
   // Move |w2| to be a child of |w1|.
   w1->AddChild(w2.get());
   // Sine we moved in the same root, observer shouldn't be notified.
   EXPECT_EQ("0 0", observer.CountStringAndReset());
   // |w2| should still have focus after moving.
   EXPECT_TRUE(w2->HasFocus());
 }
 
 }  // namespace test
 }  // namespace aura