GTTF: Clean up UITest::{Start,Stop}HttpServer:

- On Windows, LaunchAppWithHandleInheritance was not needed,
  just LaunchApp is sufficient
- Return values were not checked; I wonder how many of those
  resulted in mysterious flaky failures
- Add a scoper object (LayoutTestHttpServer), to make sure
  we stop the server even if some other assertions fail.

Note: this change may expose failures that were
silently ingored before. This is a *good* thing.

BUG=none
Review URL: http://codereview.chromium.org/7084038

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

1 files changed, 4 insertions, 2 deletions

diff --git a/content/browser/appcache/appcache_ui_test.cc b/content/browser/appcache/appcache_ui_test.cc
index 58ca32b..6200226 100644
--- a/content/browser/appcache/appcache_ui_test.cc
+++ b/content/browser/appcache/appcache_ui_test.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/file_path.h"
+#include "chrome/test/layout_test_http_server.h"
 #include "chrome/test/ui/ui_layout_test.h"
 
 class AppCacheUITest : public UILayoutTest {
@@ -16,10 +17,11 @@ class AppCacheUITest : public UILayoutTest {
     appcache_test_dir = appcache_test_dir.AppendASCII("appcache");
     InitializeForLayoutTest(http_test_dir, appcache_test_dir, kHttpPort);
 
-    StartHttpServer(new_http_root_dir_);
+    LayoutTestHttpServer http_server(new_http_root_dir_, kHttpPort);
+    ASSERT_TRUE(http_server.Start());
     for (int i = 0; i < num_tests; ++i)
       RunLayoutTest(tests[i], kHttpPort);
-    StopHttpServer();
+    ASSERT_TRUE(http_server.Stop());
   }
 
  protected: