Quit MessageLoop in ui_test_utils::DOMOperationObserver when the RenderView goes away.

chrome/test/base/ui_test_utils.cc

Index: chrome/test/base/ui_test_utils.cc
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 8adafef7ebf0414bd7984e9d811bce22701a6214..1c186357058b157b4acbc6adfda04e1624119454 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -50,6 +50,7 @@
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "googleurl/src/gurl.h"
@@ -73,10 +74,12 @@ namespace ui_test_utils {
 
 namespace {
 
-class DOMOperationObserver : public content::NotificationObserver {
+class DOMOperationObserver : public content::NotificationObserver,
+                             public TabContentsObserver {
  public:
   explicit DOMOperationObserver(RenderViewHost* render_view_host)
-      : did_respond_(false) {
+      : TabContentsObserver(render_view_host->delegate()->GetAsTabContents()),
+        did_respond_(false) {
     registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
                    content::Source<RenderViewHost>(render_view_host));
     ui_test_utils::RunMessageLoop();
@@ -84,7 +87,7 @@ class DOMOperationObserver : public content::NotificationObserver {
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) {
+                       const content::NotificationDetails& details) OVERRIDE {
     DCHECK(type == chrome::NOTIFICATION_DOM_OPERATION_RESPONSE);
     content::Details<DomOperationNotificationDetails> dom_op_details(details);
     response_ = dom_op_details->json();
@@ -92,6 +95,11 @@ class DOMOperationObserver : public content::NotificationObserver {
     MessageLoopForUI::current()->Quit();
   }
 
+  // Overridden from content::TabContentsObserver:
+  virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE {
+    MessageLoopForUI::current()->Quit();
+  }
+
   bool GetResponse(std::string* response) WARN_UNUSED_RESULT {
     *response = response_;
     return did_respond_;