wm: Update a lot of code to use structs from geometry.h.

chrome_watchdog_test.cc

 // Copyright (c) 2010 The Chromium OS 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 <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 #include "base/logging.h"
 #include "cros/chromeos_wm_ipc_enums.h"
 #include "window_manager/chrome_watchdog.h"
@@ skipping 42 matching lines @@
   xconn_->SetIntProperty(non_chrome_xid, kPidAtom, kCardinalAtom, kPid);
   xconn_->SetStringProperty(non_chrome_xid, kClientMachineAtom, GetHostname());
   SendInitialEventsForWindow(non_chrome_xid);
   xconn_->GetWindowInfoOrDie(non_chrome_xid)->client_messages.clear();
   EXPECT_FALSE(watchdog->SendPingToChrome(kTimestamp, kTimeoutMs));
   EXPECT_TRUE(
       xconn_->GetWindowInfoOrDie(non_chrome_xid)->client_messages.empty());
 
   // We should also fail if we only have a Chrome window that doesn't
   // support _NET_WM_PING...
-  XWindow non_ping_xid = CreateToplevelWindow(2, 0, 0, 0, 640, 480);
+  XWindow non_ping_xid = CreateToplevelWindow(2, 0, Rect(0, 0, 640, 480));
   xconn_->SetIntProperty(non_ping_xid, kPidAtom, kCardinalAtom, kPid);
   xconn_->SetStringProperty(non_ping_xid, kClientMachineAtom, GetHostname());
   SendInitialEventsForWindow(non_ping_xid);
   EXPECT_FALSE(watchdog->SendPingToChrome(kTimestamp, kTimeoutMs));
 
   // ... or that's running on a different host...
-  XWindow other_host_xid = CreateToplevelWindow(2, 0, 0, 0, 640, 480);
+  XWindow other_host_xid = CreateToplevelWindow(2, 0, Rect(0, 0, 640, 480));
   AppendAtomToProperty(other_host_xid, kProtocolsAtom, kPingAtom);
   xconn_->SetIntProperty(other_host_xid, kPidAtom, kCardinalAtom, kPid);
   xconn_->SetStringProperty(other_host_xid, kClientMachineAtom, "bogus123");
   SendInitialEventsForWindow(other_host_xid);
   EXPECT_FALSE(watchdog->SendPingToChrome(kTimestamp, kTimeoutMs));
 
   // ... or that didn't supply its PID.
-  XWindow no_pid_xid = CreateToplevelWindow(2, 0, 0, 0, 640, 480);
+  XWindow no_pid_xid = CreateToplevelWindow(2, 0, Rect(0, 0, 640, 480));
   AppendAtomToProperty(no_pid_xid, kProtocolsAtom, kPingAtom);
   xconn_->SetStringProperty(no_pid_xid, kClientMachineAtom, GetHostname());
   SendInitialEventsForWindow(no_pid_xid);
   EXPECT_FALSE(watchdog->SendPingToChrome(kTimestamp, kTimeoutMs));
 
   // Now create a Chrome window that supports _NET_WM_PING and has supplied
   // a PID and is running on the local host, and check that it receives a
   // message.
-  XWindow toplevel_xid = CreateToplevelWindow(2, 0, 0, 0, 640, 480);
+  XWindow toplevel_xid = CreateToplevelWindow(2, 0, Rect(0, 0, 640, 480));
   AppendAtomToProperty(toplevel_xid, kProtocolsAtom, kPingAtom);
   xconn_->SetIntProperty(toplevel_xid, kPidAtom, kCardinalAtom, kPid);
   xconn_->SetStringProperty(toplevel_xid, kClientMachineAtom, GetHostname());
   SendInitialEventsForWindow(toplevel_xid);
   MockXConnection::WindowInfo* toplevel_info =
       xconn_->GetWindowInfoOrDie(toplevel_xid);
   toplevel_info->client_messages.clear();
   EXPECT_TRUE(watchdog->SendPingToChrome(kTimestamp, kTimeoutMs));
 
   // Also check the contents of the message, per EWMH's specification of
@@ skipping 40 matching lines @@
 }
 
 }  // namespace window_manager
 
 int main(int argc, char** argv) {
   // Ensure that we don't really send signals to processes.
   window_manager::AutoReset<bool> flag_resetter(
       &FLAGS_kill_chrome_if_hanging, false);
   return window_manager::InitAndRunTests(&argc, argv, &FLAGS_logtostderr);
 }