Replace SyncTest::SetUpInProcessBrowserTestFixture with SyncTest::SetUpOnMainThread.

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 64 matching lines @@
 #include "components/sync/test/fake_server/fake_server_network_resources.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/port_util.h"
+#include "net/dns/mock_host_resolver.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 659 matching lines @@
       fake_server_->RemoveObserver(*it);
     }
   }
 
   invalidation_forwarders_.clear();
   sync_refreshers_.clear();
   fake_server_invalidation_services_.clear();
   clients_.clear();
 }
 
-void SyncTest::SetUpInProcessBrowserTestFixture() {
-  // We don't take a reference to |resolver|, but mock_host_resolver_override_
-  // does, so effectively assumes ownership.
-  net::RuleBasedHostResolverProc* resolver =
-      new net::RuleBasedHostResolverProc(host_resolver());
-  resolver->AllowDirectLookup("*.google.com");
+void SyncTest::SetUpOnMainThread() {
+  host_resolver()->AllowDirectLookup("*.google.com");
 
   // Allow connection to googleapis.com for oauth token requests in E2E tests.
-  resolver->AllowDirectLookup("*.googleapis.com");
+  host_resolver()->AllowDirectLookup("*.googleapis.com");
 
   // On Linux, we use Chromium's NSS implementation which uses the following
   // hosts for certificate verification. Without these overrides, running the
   // integration tests on Linux causes error as we make external DNS lookups.
-  resolver->AllowDirectLookup("*.thawte.com");
-  resolver->AllowDirectLookup("*.geotrust.com");
-  resolver->AllowDirectLookup("*.gstatic.com");
-  mock_host_resolver_override_ =
-      base::MakeUnique<net::ScopedDefaultHostResolverProc>(resolver);
-}
-
-void SyncTest::TearDownInProcessBrowserTestFixture() {
-  mock_host_resolver_override_.reset();
+  host_resolver()->AllowDirectLookup("*.thawte.com");
+  host_resolver()->AllowDirectLookup("*.geotrust.com");
+  host_resolver()->AllowDirectLookup("*.gstatic.com");
 }
 
 void SyncTest::WaitForDataModels(Profile* profile) {
   bookmarks::test::WaitForBookmarkModelToLoad(
       BookmarkModelFactory::GetForBrowserContext(profile));
   ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile(
       profile, ServiceAccessType::EXPLICIT_ACCESS));
   search_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(profile));
 }
@@ skipping 425 matching lines @@
 bool SyncTest::ClearServerData(ProfileSyncServiceHarness* harness) {
   // At this point our birthday is good.
   base::RunLoop run_loop;
   harness->service()->ClearServerDataForTest(run_loop.QuitClosure());
   run_loop.Run();
 
   // Our birthday is invalidated on the server here so restart sync to get
   // the new birthday from the server.
   return harness->RestartSyncService();
 }