Explicitly shutting down tabs and server at end of apprtc test.

This is another attempt to try to figure out where we are really
hanging when this test hangs on the Win7 WebRTC bot.

no-try to bypass flaky win_rel bot.

TBR=grunell@chromium.org
BUG=373252
NOTRY=true

Review URL: https://codereview.chromium.org/309273002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274574 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

@@ -220,8 +220,10 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
     return false;
   }
 
- private:
+  // TODO(phoglund): should be private again after win-only experiments.
   base::ProcessHandle dev_appserver_;
+
+ private:
   base::ProcessHandle firefox_;
 };
 
@@ -284,6 +286,16 @@ IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
 
   LOG(INFO) << "Slept a bit; " << timer.Elapsed().InSeconds()
             << " seconds elapsed.";
+
+#if defined (OS_WIN)
+  // TODO(phoglund): experimenting with explicitly tearing down here.
+  chrome::CloseWebContents(browser(), left_tab, false);
+  LOG(INFO) << "Closed left tab.";
+  chrome::CloseWebContents(browser(), right_tab, false);
+  LOG(INFO) << "Closed right tab.";
+
+  base::KillProcess(dev_appserver_, 0, false);
+#endif
 }
 
 #if defined(OS_LINUX)