Replace SyncTest::SetUpInProcessBrowserTestFixture with SyncTest::SetUpOnMainThread.

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 <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/protocol/sync_protocol_error.h"
 #include "components/sync/test/fake_server/fake_server.h"
 #include "components/sync/test/local_sync_test_server.h"
-#include "net/dns/mock_host_resolver.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 
 // The E2E tests are designed to run against real backend servers. To identify
 // those tests we use *E2ETest* test name filter and run disabled tests.
 //
 // The following macros define how a test is run:
 // - E2E_ONLY: Marks a test to run only as an E2E test against backend servers.
 //             These tests DO NOT run on regular Chromium waterfalls.
 // - E2E_ENABLED: Marks a test to run as an E2E test in addition to Chromium
@@ skipping 23 matching lines @@
 class ProfileSyncService;
 }  // namespace browser_sync
 
 namespace fake_server {
 class FakeServer;
 class FakeServerInvalidationService;
 }  // namespace fake_server
 
 namespace net {
 class FakeURLFetcherFactory;
-class ScopedDefaultHostResolverProc;
 class URLFetcherImplFactory;
 }  // namespace net
 
 // 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 SyncTest : public InProcessBrowserTest {
  public:
   // The different types of live sync tests that can be implemented.
   enum TestType {
@@ skipping 181 matching lines @@
   arc::SyncArcPackageHelper* sync_arc_helper();
 
  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);
 
-  // BrowserTestBase override. Destroys all the sync clients and sync
-  // profiles created by a test.
+  // BrowserTestBase implementation:
+  void SetUpOnMainThread() override;
   void TearDownOnMainThread() override;
 
-  // InProcessBrowserTest override. Changes behavior of the default host
-  // resolver to avoid DNS lookup errors.
-  void SetUpInProcessBrowserTestFixture() override;
-
-  // InProcessBrowserTest override. Resets the host resolver its default
-  // behavior.
-  void TearDownInProcessBrowserTestFixture() override;
-
   // Implementations of the EnableNotifications() and DisableNotifications()
   // functions defined above.
   void DisableNotificationsImpl();
   void EnableNotificationsImpl();
 
   // If non-empty, |contents| will be written to a profile's Preferences file
   // before the Profile object is created.
   void SetPreexistingPreferencesFileContents(const std::string& contents);
 
   // Helper to ProfileManager::CreateProfileAsync that creates a new profile
@@ skipping 160 matching lines @@
 
   // Indicates whether changes to a profile should also change the verifier
   // profile or not.
   bool use_verifier_;
 
   // Indicates the need to create Gaia user account at runtime. This can only be
   // set if tests are run against external servers with support for user
   // creation via http requests.
   bool create_gaia_account_at_runtime_;
 
-  // Sync integration tests 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.
-  std::unique_ptr<net::ScopedDefaultHostResolverProc>
-      mock_host_resolver_override_;
-
   // Used to start and stop the local test server.
   base::Process test_server_;
 
   // Fake URLFetcher factory used to mock out GAIA signin.
   std::unique_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
   std::unique_ptr<net::URLFetcherImplFactory> factory_;
 
   // The contents to be written to a profile's Preferences file before the
   // Profile object is created. If empty, no preexisting file will be written.
   std::string preexisting_preferences_file_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_