[content shell] don't open new windows after printing the test results

content/shell/webkit_test_controller.cc

 // 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.
 
 #include "content/shell/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 246 matching lines @@
   }
   return true;
 }
 
 bool WebKitTestController::ResetAfterLayoutTest() {
   DCHECK(CalledOnValidThread());
   printer_->PrintTextFooter();
   printer_->PrintImageFooter();
   send_configuration_to_next_host_ = false;
   is_running_test_ = false;
+  is_cleaning_up_ = false;
   is_compositing_test_ = false;
   enable_pixel_dumping_ = false;
   expected_pixel_hash_.clear();
   test_url_ = GURL();
   prefs_ = WebPreferences();
   should_override_prefs_ = false;
   watchdog_.Cancel();
   return true;
 }
 
@@ skipping 15 matching lines @@
       CommandLine& command_line = *CommandLine::ForCurrentProcess();
       if (!command_line.HasSwitch(switches::kEnableSoftwareCompositing))
         prefs->accelerated_2d_canvas_enabled = true;
       prefs->accelerated_compositing_for_video_enabled = true;
       prefs->mock_scrollbars_enabled = true;
     }
   }
 }
 
 void WebKitTestController::OpenURL(const GURL& url) {
+  if (is_cleaning_up_)
+    return;
+
   Shell::CreateNewWindow(main_window_->web_contents()->GetBrowserContext(),
                          url,
                          main_window_->web_contents()->GetSiteInstance(),
                          MSG_ROUTING_NONE,
                          gfx::Size());
 }
 
 void WebKitTestController::TestFinishedInSecondaryWindow() {
   RenderViewHost* render_view_host =
       main_window_->web_contents()->GetRenderViewHost();
@@ skipping 138 matching lines @@
   params.allow_external_pages = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAllowExternalPages);
   params.expected_pixel_hash = expected_pixel_hash_;
   params.initial_size = initial_size_;
   render_view_host->Send(new ShellViewMsg_SetTestConfiguration(
       render_view_host->GetRoutingID(), params));
 }
 
 void WebKitTestController::OnTestFinished(bool did_timeout) {
   watchdog_.Cancel();
+  is_cleaning_up_ = true;
   if (did_timeout) {
     printer_->AddErrorMessage(
         "FAIL: Timed out waiting for notifyDone to be called");
     DiscardMainWindow();
     return;
   }
   if (!printer_->output_finished())
     printer_->PrintImageFooter();
   RenderViewHost* render_view_host =
       main_window_->web_contents()->GetRenderViewHost();
@@ skipping 144 matching lines @@
   }
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 void WebKitTestController::OnResetDone() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 }  // namespace content