[content shell] change how the main render view is picked for layout tests

content/shell/webkit_test_runner_host.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_RUNNER_HOST_H_
 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_HOST_H_
 
 #include <ostream>
 #include <string>
 
@@ skipping 93 matching lines @@
   bool dump_child_frames() const { return dump_child_frames_; }
   void set_dump_child_frames(bool dump_child_frames) {
     dump_child_frames_ = dump_child_frames;
   }
   bool is_printing() const { return is_printing_; }
   void set_is_printing(bool is_printing) { is_printing_ = is_printing; }
 
   // WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void PluginCrashed(const FilePath& plugin_path) OVERRIDE;
-  virtual void RenderViewReady() OVERRIDE;
+  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
   virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
 
  private:
   static WebKitTestController* instance_;
 
   void CaptureDump();
   void TimeoutHandler();
 
   // Message handlers.
@@ skipping 12 matching lines @@
   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_set_as_main_window_;
-
   base::CancelableClosure watchdog_;
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
 };
 
 class WebKitTestRunnerHost : public RenderViewHostObserver {
  public:
   explicit WebKitTestRunnerHost(RenderViewHost* render_view_host);
   virtual ~WebKitTestRunnerHost();
 
@@ skipping 11 matching lines @@
 
   void OnNotImplemented(const std::string& object_name,
                         const std::string& method_name);
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestRunnerHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_WEBKIT_TEST_RUNNER_HOST_H_