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

content/shell/webkit_test_runner_host.h

Index: content/shell/webkit_test_runner_host.h
diff --git a/content/shell/webkit_test_runner_host.h b/content/shell/webkit_test_runner_host.h
index 53573bf427253d2423c3c3ee1507c5c7b77accb8..ea09ec2f657ccb63759e735d12136df75a9f8ebc 100644
--- a/content/shell/webkit_test_runner_host.h
+++ b/content/shell/webkit_test_runner_host.h
@@ -111,7 +111,7 @@ class WebKitTestController : public base::NonThreadSafe,
   // 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;
 
@@ -144,8 +144,6 @@ class WebKitTestController : public base::NonThreadSafe,
   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);