[content shell] if a layout test runs notifyDone() before it has finished loading, wait for the pag…

content/shell/webkit_test_controller.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 "content/shell/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 169 matching lines @@
   printer_->PrintTextFooter();
   printer_->PrintImageFooter();
   enable_pixel_dumping_ = false;
   expected_pixel_hash_.clear();
   captured_dump_ = false;
   dump_as_text_ = false;
   dump_child_frames_ = false;
   is_printing_ = false;
   should_stay_on_page_after_handling_before_unload_ = false;
   wait_until_done_ = false;
+  did_finish_load_ = false;
   prefs_.reset(new ShellWebPreferences);
   {
     base::AutoLock lock(lock_);
     can_open_windows_ = false;
   }
   watchdog_.Cancel();
   if (main_window_) {
     Observe(NULL);
     main_window_ = NULL;
   }
@@ skipping 89 matching lines @@
   }
 }
 
 void WebKitTestController::TimeoutHandler() {
   DCHECK(CalledOnValidThread());
   printer_->AddErrorMessage(
       "FAIL: Timed out waiting for notifyDone to be called");
 }
 
 void WebKitTestController::OnDidFinishLoad() {
+  did_finish_load_ = true;
   if (wait_until_done_)
     return;
   CaptureDump();
 }
 
 void WebKitTestController::OnImageDump(
     const std::string& actual_pixel_hash,
     const SkBitmap& image) {
   SkAutoLockPixels image_lock(image);
 
@@ skipping 53 matching lines @@
 
 void WebKitTestController::OnOverridePreferences(
     const ShellWebPreferences& prefs) {
   *prefs_.get() = prefs;
 }
 
 void WebKitTestController::OnNotifyDone() {
   if (!wait_until_done_)
     return;
   watchdog_.Cancel();
+  if (!did_finish_load_) {
+    wait_until_done_ = false;
+    return;
+  }
   CaptureDump();
 }
 
 void WebKitTestController::OnDumpAsText() {
   dump_as_text_ = true;
 }
 
 void WebKitTestController::OnSetPrinting() {
   is_printing_ = true;
 }
@@ skipping 46 matching lines @@
 
 void WebKitTestController::OnNotImplemented(
     const std::string& object_name,
     const std::string& property_name) {
   printer_->AddErrorMessage(
       std::string("FAIL: NOT IMPLEMENTED: ") +
       object_name + "." + property_name);
 }
 
 }  // namespace content