Cleanup more test code.

chrome/test/live_sync/live_sync_test.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include "chrome/test/in_process_browser_test.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
-#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/common/net/test_url_fetcher_factory.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/test/test_server.h"
 
 #include <string>
 #include <vector>
 
 class CommandLine;
 class Profile;
+class ProfileSyncServiceHarness;
 class URLRequestContextGetter;
+class FakeURLFetcherFactory;
 
 namespace net {
 class ProxyConfig;
 class ScopedDefaultHostResolverProc;
 }
 
 // This is the base class for integration tests for all sync data types. Derived
 // classes must be defined for each sync data type. Individual tests are defined
 // using the IN_PROC_BROWSER_TEST_F macro.
 class LiveSyncTest : public InProcessBrowserTest {
@@ skipping 14 matching lines @@
     MULTIPLE_CLIENT,
 
     // Tests where several client profiles are synced with the server. Only used
     // by stress tests.
     MANY_CLIENT
   };
 
   // A LiveSyncTest must be associated with a particular test type.
   explicit LiveSyncTest(TestType test_type);
 
-  virtual ~LiveSyncTest() {}
+  virtual ~LiveSyncTest();
 
   // Validates command line parameters and creates a local python test server if
   // specified.
   virtual void SetUp();
 
   // Brings down local python test server if one was created.
   virtual void TearDown();
 
   // Sets up command line flags required for sync tests.
   virtual void SetUpCommandLine(CommandLine* cl);
@@ skipping 141 matching lines @@
   // Used to start and stop the local test server.
   base::ProcessHandle test_server_handle_;
 
   // Fake URLFetcher factory used to mock out GAIA signin.
   scoped_ptr<FakeURLFetcherFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_