commit 05420811c4da63de5bd73ccad906459a0d9537e6
author Ken Chen <cken@google.com> Tue Apr 07 18:58:38 2020 +0000
committer Ken Chen <cken@google.com> Thu Apr 09 13:31:35 2020 +0000
tree d0c22bdf5d0e16cee2493bf22addb0eff01a8ebe
parent 8b977baec9d8fcfff4756be92fa6c8474ce33313

Rename ResolverExperimentalOptions to ResolverOptions

Remove 'Experimental' from parcel name and variable name for better
naming.

Bug: 139646101
Merged-In: Iaa75e8028e98998eca4c9b821aa07effab19dac3
Change-Id: I0846df1789a2ebb5f048ec69b94bd8e5af494165
(cherry picked from commit e0fa154dffe0b780234d8f5b337046616c939a7f)

tests/resolv_integration_test.cpp

diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index 9dda0f1..270f040 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -1087,7 +1087,7 @@
     test::DNSResponder dns;
     StartDns(dns, {});
     auto resolverParams = DnsResponderClient::GetDefaultResolverParamsParcel();
-    resolverParams.experimentalOptions.hosts = invalidCustHosts;
+    resolverParams.resolverOptions.hosts = invalidCustHosts;
     ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
     for (const auto& hostname : {hostnameNoip, hostnameInvalidip}) {
         // The query won't get data from customized table because of invalid customized table
@@ -1162,7 +1162,7 @@
         StartDns(dns, config.dnsserverHosts);
 
         auto resolverParams = DnsResponderClient::GetDefaultResolverParamsParcel();
-        resolverParams.experimentalOptions.hosts = config.customizedHosts;
+        resolverParams.resolverOptions.hosts = config.customizedHosts;
         ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
         const addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM};
         ScopedAddrinfo result = safe_getaddrinfo(config.name.c_str(), nullptr, &hints);
@@ -1198,7 +1198,7 @@
     StartDns(dns, dnsSvHostV4V6);
     auto resolverParams = DnsResponderClient::GetDefaultResolverParamsParcel();
 
-    resolverParams.experimentalOptions.hosts = custHostV4V6;
+    resolverParams.resolverOptions.hosts = custHostV4V6;
     ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
     const addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM};
     ScopedAddrinfo result = safe_getaddrinfo(hostnameV4V6, nullptr, &hints);
@@ -1206,7 +1206,7 @@
     EXPECT_THAT(ToStrings(result), testing::UnorderedElementsAreArray({custAddrV4, custAddrV6}));
     EXPECT_EQ(0U, GetNumQueries(dns, hostnameV4V6));
 
-    resolverParams.experimentalOptions.hosts = {};
+    resolverParams.resolverOptions.hosts = {};
     ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
     result = safe_getaddrinfo(hostnameV4V6, nullptr, &hints);
     ASSERT_TRUE(result != nullptr);
@@ -4139,7 +4139,7 @@
         ResolverParamsParcel parcel = DnsResponderClient::GetDefaultResolverParamsParcel();
         parcel.servers = {listen_addr, listen_addr2};
         if (config.tcMode) {
-            parcel.experimentalOptions.tcMode = config.tcMode.value();
+            parcel.resolverOptions.tcMode = config.tcMode.value();
         }
         ASSERT_EQ(mDnsClient.resolvService()->setResolverConfiguration(parcel).isOk(), config.ret);