Give the layout test harness better information to determine when to finish.

content/shell/renderer/test_runner/web_test_proxy.h

Index: content/shell/renderer/test_runner/web_test_proxy.h
diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h
index 2ead7037d0e87ff18a4146ba80a373c6b0938080..2abdc9a36ae62ffc7f3161505fa5cbbef6dc0766 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.h
+++ b/content/shell/renderer/test_runner/web_test_proxy.h
@@ -244,7 +244,13 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
  private:
   template <class, typename, typename>
   friend class WebFrameTestProxy;
-  void LocationChangeDone(blink::WebFrame* frame);
+
+  enum CheckDoneReason {
+    LoadFinished,
+    MainResourceLoadFailed,
+    ResourceLoadCompleted
+  };
+  void CheckDone(blink::WebLocalFrame* frame, CheckDoneReason reason);
   void AnimateNow();
   void DrawSelectionRect(SkCanvas* canvas);
   void DidDisplayAsync(const base::Closure& callback, const SkBitmap& bitmap);