Consolidate message observer API for win and aura (and touch).

chrome/browser/ui/views/html_dialog_view_browsertest.cc

Index: chrome/browser/ui/views/html_dialog_view_browsertest.cc
diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
index 8ef4c15bd5dec308f4caac4f38f41914b1d754e8..4a95b4daf3f616d367479b21842683b0ec865231 100644
--- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
@@ -77,10 +77,13 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest {
     }
 
     // This method is called before processing a message.
-    virtual void WillProcessMessage(const MSG& msg) {}
+    virtual base::EventStatus WillProcessEvent(
+        const MSG& msg) OVERRIDE {
+      return base::EVENT_CONTINUE;
+    }
 
     // This method is called after processing a message.
-    virtual void DidProcessMessage(const MSG& msg) {
+    virtual void DidProcessEvent(const MSG& msg) OVERRIDE {
       // Either WM_PAINT or WM_TIMER indicates the actual work of
       // pushing through the window resizing messages is done since
       // they are lower priority (we don't get to see the
@@ -89,7 +92,30 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest {
         MessageLoop::current()->Quit();
     }
   };
-#elif !defined(OS_MACOSX)
+#elif defined(TOUCH_UI) || defined(USE_AURA)
+  class WindowChangedObserver : public MessageLoopForUI::Observer {
+   public:
+    WindowChangedObserver() {}
+
+    static WindowChangedObserver* GetInstance() {
+      return Singleton<WindowChangedObserver>::get();
+    }
+
+    // This method is called before processing a message.
+    virtual base::EventStatus WillProcessEvent(XEvent* event) {
+      return base::EVENT_CONTINUE;
+    }
+
+    // This method is called after processing a message.
+    virtual void DidProcessEvent(XEvent* event) {
+      // Quit once the ConfigureNotify event has been processed - seeing
+      // this means the window sizing request that was made actually
+      // happened.
+      if (event->type == ConfigureNotify)
+        MessageLoop::current()->Quit();
+    }
+  };
+#elif defined(TOOLKIT_USES_GTK)
   class WindowChangedObserver : public MessageLoopForUI::Observer {
    public:
     WindowChangedObserver() {}