Adding a TearDown() method to class LiveSyncTest.

chrome/test/live_sync/live_sync_test.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
 #define CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
 
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
     // of sync server "providers" -- a script that could locate (or allocate)
     // a sync server instance, possibly on some remote host.  The provider
     // would be invoked before each test.
     if (!cl->HasSwitch(switches::kSyncServiceURL))
       SetUpLocalTestServer();
 
     // Yield control back to the InProcessBrowserTest framework.
     InProcessBrowserTest::SetUp();
   }
 
+  virtual void TearDown() {
+    // Allow the InProcessBrowserTest framework to perform its tear down.
+    InProcessBrowserTest::TearDown();
+
+    // Stop the local test sync server if one was used.
+    if (started_local_test_server_)
+      TearDownLocalTestServer();
+  }
+
   virtual void SetUpLocalTestServer() {
     bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
         server_.kHostName, server_.kOKHTTPSPort,
         FilePath(), FilePath(), std::wstring());
     ASSERT_TRUE(success);
 
+    started_local_test_server_ = true;
+
     CommandLine* cl = CommandLine::ForCurrentProcess();
     cl->AppendSwitchWithValue(switches::kSyncServiceURL,
         StringPrintf("http://%s:%d/chromiumsync", server_.kHostName,
             server_.kOKHTTPSPort));
   }
 
+  virtual void TearDownLocalTestServer() {
+    bool success = server_.Stop();
+    ASSERT_TRUE(success);
+  }
+
   // Append command line flag to enable sync.
   virtual void SetUpCommandLine(CommandLine* command_line) {
   }
 
   // Helper to get a handle on a bookmark in |m| when the url is known to be
   // unique.
   static const BookmarkNode* GetByUniqueURL(BookmarkModel* m, const GURL& url);
 
   // Helper to ProfileManager::CreateProfile that handles path creation.
   static Profile* MakeProfile(const FilePath::CharType* name);
@@ skipping 10 matching lines @@
   virtual void SetUpInProcessBrowserTestFixture();
   virtual void TearDownInProcessBrowserTestFixture();
 
  private:
   // LiveBookmarksSyncTests need to make live DNS requests for access to
   // GAIA and sync server URLs under google.com.  We use a scoped version
   // to override the default resolver while the test is active.
   scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
 
   net::TestServerLauncher server_;
+  bool started_local_test_server_;
 
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_