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

content/shell/renderer/test_runner/web_test_proxy.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 226 matching lines @@
                                         blink::WebSecurityOrigin target,
                                         blink::WebDOMMessageEvent event);
   void ResetInputMethod();
 
   blink::WebString acceptLanguages();
   blink::WebPushClient* GetWebPushClient();
 
  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);
 
   blink::WebWidget* web_widget() const { return web_widget_; }
 
   TestInterfaces* test_interfaces_;
   WebTestDelegate* delegate_;
   blink::WebWidget* web_widget_;
 
@@ skipping 135 matching lines @@
     return WebTestProxyBase::GetWebPushClient();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_