Close all windows in test controller shutdown

content/shell/browser/layout_test/blink_test_controller.cc

 // Copyright 2013 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/browser/layout_test/blink_test_controller.h"
 
 #include <stddef.h>
 
 #include <iostream>
 #include <set>
@@ skipping 237 matching lines @@
   GpuDataManager::GetInstance()->AddObserver(this);
   ResetAfterLayoutTest();
 }
 
 BlinkTestController::~BlinkTestController() {
   DCHECK(CalledOnValidThread());
   CHECK(instance_ == this);
   CHECK(test_phase_ == BETWEEN_TESTS);
   GpuDataManager::GetInstance()->RemoveObserver(this);
   DiscardMainWindow();
+  Shell::CloseAllWindows();

[Peter Beverloo, 2016/09/22 12:21:40]

Maybe we should consider moving this to LayoutTestBrowserMain() in
//content/shell/browser/layout_test/layout_test_browser_main.cc, since we do it
there for the --check-layout-test-sys-deps flag too.

We'll have to keep an eye out on how the Android bot reacts- that function,
together with RunTests(), shut down the main runner at subtly different times.
(Android doesn't run the message loop before shutting it down all other
platforms do.)

This change means that difference will go away, since CloseAllWindows() does run
the message loop as well. We may be able to delete that difference if it goes
well.

Unfortunately none of this is covered by the CQ, but I'll be around in the next
few days to check the bot too.

   instance_ = NULL;
 }
 
 bool BlinkTestController::PrepareForLayoutTest(
     const GURL& test_url,
     const base::FilePath& current_working_directory,
     bool enable_pixel_dumping,
     const std::string& expected_pixel_hash) {
   DCHECK(CalledOnValidThread());
   test_phase_ = DURING_TEST;
@@ skipping 676 matching lines @@
   } else {
     printer_->AddErrorMessage(base::StringPrintf(
         "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
         event_name.c_str()));
     return;
   }
   bluetooth_chooser_factory_->SendEvent(event, argument);
 }
 
 }  // namespace content