Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/sync/test/integration/sync_test.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 239 matching lines @@
   fake_server::FakeServer* GetFakeServer() const;
 
  protected:
   // Add custom switches needed for running the test.
   virtual void AddTestSwitches(base::CommandLine* cl);
 
   // Append the command line switches to enable experimental types that aren't
   // on by default yet.
   virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl);
 
-  // InProcessBrowserTest override. Destroys all the sync clients and sync
+  // BrowserTestBase override. Destroys all the sync clients and sync
   // profiles created by a test.
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   // InProcessBrowserTest override. Changes behavior of the default host
   // resolver to avoid DNS lookup errors.
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
 
   // InProcessBrowserTest override. Resets the host resolver its default
   // behavior.
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
 
   // Creates Profile, Browser and ProfileSyncServiceHarness instances for
@@ skipping 143 matching lines @@
   // Fake URLFetcher factory used to mock out GAIA signin.
   scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
   scoped_ptr<net::URLFetcherImplFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_