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

content/shell/webkit_test_controller.h

 // 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.
 
 #ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
 
 #include <ostream>
 #include <string>
 
@@ skipping 128 matching lines @@
   bool enable_pixel_dumping_;
   std::string expected_pixel_hash_;
 
   bool captured_dump_;
 
   bool dump_as_text_;
   bool dump_child_frames_;
   bool is_printing_;
   bool should_stay_on_page_after_handling_before_unload_;
   bool wait_until_done_;
+  bool did_finish_load_;
+
   // TODO(jochen): Once we remove layout tests from content_browsertests, make
   // this a member instead of a scoped_ptr.
   scoped_ptr<ShellWebPreferences> prefs_;
 
   base::CancelableClosure watchdog_;
 
   // Access to the following variables needs to be guarded by |lock_|.
   mutable base::Lock lock_;
   bool can_open_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_